More and more coding style fixes