+ Refactoring step 1 completed