format: Trivial reorganisation