Refactoring continued