Further style fixes