Various coding style fixes