Coding conventions clean up