Use either int or short

[alexpogostin]

During the code creation process, have gone through several iterations of either using int or short. Now the code has a mix of both - but should be fixed with a re-write. That is - either use short or int only. Or even char if warranted.