google style and lint changes