Coding standards
Minor clean up