More code-style fixes