Refactored product list