Yet more refactoring