Fixed whitespace and moved around some stuff

I think TextWrangler messed up this file when you were trying to indent. So, I fixed all of the indents and whitespace. I also moved some stuff around. FYI, you're doing both "import random" and "from random import randint".

Also, your current structure is inherently buggy because you used TONS of shortcuts and half-ass attempts to fix those shortcuts when trying to fix those shortcuts when they inevitably threw errors.