Refactor step 2