Nice new styles
Make it purdy.
Merge pull request #4 from andrewhao/style-fixes

Style fixes