Coding style fixes

Yes, I go back and forth on this issue.
Merge branch 'master' into production