further style fixes