Refactoring step 1 is done