Clean up code formatting

[morgant]

The code formatting is very old and inconsistent. At some point we should create a real style guide in CONTRIBUTING.md and work to update the code to conform to it. This is a low priority.