Cleaned up a little and fixed small errors.

Specifically I merged one method while fixing another around
registers. Also, fixed the colorizing around array data when it
is a short (new output from smali, added an s like 0x19s for
short indication)