style updates
Merge pull request #24 from Lukenickerson/master

style updates