clean up coding style