Cleaned up store inventory and item type order