Update ItemStack reference to getTypeId()
Cleanup