am f32ec4c9: More reformatting for uniformity

* commit 'f32ec4c9e62d2a8f27299807ba70ca29d98b3af2':
  More reformatting for uniformity