coding-style fixes