refactor of MakeInventory and InventoryBuilder class