Clean up some style things that were bugging me

I hope this is okay, I tried to figure out a consistent style from the
existing code. If you'd like me to change any of this, I'm certainly
open to suggestions.
Merge pull request #4 from omni5cience/Style_Changes

Style changes