Refactor steps.