Various styling fixes
Merge pull request #254 from google/styling

Various styling fixes