Refactor Market.enumerize