Tidy-up after refactoring