Cleanup formatting.
merged cleanup into master locally
Merge pull request #74 from s-loar/cleanup

Cleanup formatting.