checkout_step refactor