Trivial: tidy-up