Yes more refactoring