Rearanged some code to get rid of jumps that were already there - 4 more bytes saved