Refactoring 1,2