Coding standard cleanups