CHECKOUT :: Minor Checkout Model and Controller Rework