some last cleaning up

just cleaned up some of the conditional logic for the actual printing
of the numbers to make it more readable and slightly faster.