more coding style fixes