cart_items refactored