Coding style and cleanup run