Prepare next refactor steps