Minor code-style fixes