code-style fixes