Coding style clean ups