Fixed your gross whitespace and indentation

Yo, that stuff looked gross.

Now it doesn't :P

I left your if statements using their curly brackets on the below lines, and classes/functions using them on the same line.  Not sure if that was intentional or not.