Coding Standards

Code changes to adhere to coding standards.