Add more human readable types.

Using int everywhere makes the code difficult to fallow.