coding style clean up