Formatting is inconsistent

[clintonmead]

Code formatting is getting increasingly inconsistent. I should pick a code formatting approach, and put it in as a precommit hook.