refactor quote and checkout address step