More changes to align to Google style guidelines