Make checkout more functional