More of code style fixes.