refactor checkout shipping step