more coding style fixes.
more coding style fixes.