Coding style cleanups