Updates for Google style guide