Small code-style fixes