Refactoring: continued