Style improvments
Merge pull request #3 from ty221/master

Style improvments