Refactoring Inventory UC