am 95fc9c80: More reformatting for uniformity

* commit '95fc9c80114e296a46e29fb577d532844f83cc0d':
  More reformatting for uniformity