post-refactor tidy-up