Improving/refactoring the checkout process
Minor refactoring