am 70fe7366: More reformatting for uniformity

* commit '70fe7366dfd5b9ddf85dbfb18dd9ccfd8194a40e':
  More reformatting for uniformity