clean up coding style a bit