diff --git a/src/runner/instance.rs b/src/runner/instance.rs
index b088f38..2da9a52 100644
--- a/src/runner/instance.rs
+++ b/src/runner/instance.rs
@@ -345,7 +345,12 @@ type ClassFunctionPointer=fn(&mlua::Lua,mlua::MultiValue)->mlua::Result<mlua::Mu
 // TODO: use macros to define these with better organization
 /// A double hash map of function pointers.
 /// The class tree is walked by the Instance.__index metamethod to find available class methods.
-static CLASS_FUNCTION_DATABASE:phf::Map<&str,phf::Map<&str,ClassFunctionPointer>>=phf::phf_map!{
+type CFD=phf::Map<&'static str,// Class name
+	phf::Map<&'static str,// Method name
+		ClassFunctionPointer
+	>
+>;
+static CLASS_FUNCTION_DATABASE:CFD=phf::phf_map!{
 	"DataModel"=>phf::phf_map!{
 		"GetService"=>cf!(|lua,_this,service:mlua::String|{
 			dom_mut(lua,|dom|{
@@ -374,7 +379,7 @@ static CLASS_FUNCTION_DATABASE:phf::Map<&str,phf::Map<&str,ClassFunctionPointer>
 #[derive(Default)]
 struct ClassFunctions{
 	classes:HashMap<&'static str,//ClassName
-		HashMap<&'static str,//Function name
+		HashMap<&'static str,//Method name
 			mlua::Function
 		>
 	>