Coding style and clean up