Refactor itemType out of style choice hash