Re-factored the checkout-procedure checking