style improvements
Merge pull request #2 from kiawins/master

style improvements