Code-style fixes