Another bunch of coding style fixes