Refactor step 1