style guide
Merge pull request #298 from lindbrook/patch-3

style guide