some coding style fixes.