Simplify code a little

Or expand it. Not really sure of the terminology, but got rid of a few
+= and did it the long way. Also, got rid of:

if <condition>:
    +2
+2

and just did a plus 4 or a plus 2. should speed things up a little.