Formatting fix

With the exception of tabs, everything conforms to the One True Brace Style. Let me know if you'd prefer spaces, or some other changes. I feel that the code as is is maximally readable for most other developers, but since it's your project it has to be readable to you as well!