Another tidy-up commit