Tidying up the refactoring