feature: style updates
merging changes

Merge branch 'master' into style_updates
Merge pull request #62 from 4justinstewart/style_updates

Style updates