Refactor Inventory