more code-style fixes