Refactor steps