Post Sprint 1 Code Cleanup

This is a branch for quick cosmetic cleanups: indentation and white space.

A lot more cleanup is needed with regards to code quality, but that's a another day's fight.

This branch will be merged after we are all done pushing our cleanups, or tonight at 3am, whichever comes first.