@@ -85,9 +85,9 @@
 local find_builtin = function(method,kind)
 	return function(out)
 		local rec = {}
 		local crec = sorcery.lib.tbl.walk(minetest.registered_items[out],{'_sorcery','recipe','canonical',kind})
-		local w=0, lst
+		local w, lst = 0
 		if crec then
 			lst = {}
 			for i,v in pairs(crec) do
 				if #v > w then w = #v end
@@ -111,11 +111,9 @@
 		-- for j=1,#i.items do
 		for j,item in pairs(lst) do
 			local row = math.floor((j-1) / w)
 			local col = (j-1) % w
-			if item then
-				rec[1 + (row * 3) + col] = item
-			end
+			if item then rec[1 + (row * 3) + col] = item end
 		end
 		return rec
 	end
 end
@@ -221,12 +219,12 @@
 			{0,1};
 		};
 		pick = function(restrict)
 			-- TODO make sure affinity restrictions match
-			return sorcery.data.infusions[math.random(#sorcery.data.infusions)].output
+			return sorcery.register.infusions.db[math.random(#sorcery.register.infusions.db)].output
 		end;
 		title = function(output)
-			for _,i in pairs(sorcery.data.infusions) do
+			for _,i in pairs(sorcery.register.infusions.db) do
 				if i.output == output then
 					if i._proto and i._proto.name
 						then return i._proto.name
 						else break end
@@ -234,16 +232,16 @@
 			end
 			return 'Mysterious Potion'
 		end;
 		find = function(out)
-			for _,i in pairs(sorcery.data.infusions) do
+			for _,i in pairs(sorcery.register.infusions.db) do
 				if i.output == out then
 					return { i.infuse, i.into }
 				end
 			end
 		end;
 		props = function(out)
-			for _,i in pairs(sorcery.data.infusions) do
+			for _,i in pairs(sorcery.register.infusions.db) do
 				if i.output == out then
 					if i.recipe then return i.recipe else return {} end
 				end
 			end