more coding style fixes.