Trivial tidy-up