some Inventory stuff and resharper run