General style fixes