Coding style clean up