Coding standards cleanup