Changes to match Google style guidelines