Minor style updates
Merge pull request #15 from nateify/dev

sync with 2.2.4