More code style fixes