Refactoring two