Refactor product catalog