some coding style fixes