Refactor for GoodsService.