Cleans up some of the checkout logic & validation.