even more coding style fixes