various coding style fixes.