Clean up

refactored some line item and cart stuff