Refactoring 1