Coding standards and namespace fixes
Merge pull request #1217 from ADmad/3.0-cs-fixes

Coding standards and namespace fixes