Clean up some style stuff

Got some complaints in #5 about style inconsistencies so I'm fixing them.

/cc @jessicard