some coding style cleanup