Refactoring 2