Style improvements
Merge pull request #6 from k88hudson/style

Style improvements