Code style cleanup, no logic changes.
Merge pull request #39 from tensafefrogs/master

Code style cleanup, no logic changes.
Merge branch 'master' into diversity