Clean up Cart

Cleaned up code in cart