google style fixes