Coding style and cleanup