More coding style fixes