Fix coding standards
Merge pull request #4883 from bcrowe/3.0-cs

3.0 - Fix coding standards