Seperate Inventory handling
code cleanup