am e8a30f37: Merge "Fix some style nitpicks"

* commit 'e8a30f37bf1530a80a7df17692dbe7a68764ac30':
  Fix some style nitpicks