Tidy up post refactoring