Even more code style fixes