Coding standards cleanup
Coding standards fixes