some cleanup
Merge pull request #9 from EmFoley/style_up

some cleanup