Some coding style fixes