coding style
more cleaning up