Couple more changes
Merge pull request #72 from taylorzr/style-updates

Couple more changes