Style and other minor updates
Merge pull request #2 from jacksoncvm/master

Style and other minor updates v1