Formatting fixes according to Google style guidelines.