diff --git a/commands.lua b/commands.lua
index a6622ac43..731f3deaa 100644
--- a/commands.lua
+++ b/commands.lua
@@ -5,6 +5,7 @@ Keydef = {
 	modifier = nil,
 	descr = nil
 }
+
 function Keydef:_new(obj)
 	-- obj definition
 	obj = obj or {}
@@ -13,6 +14,7 @@ function Keydef:_new(obj)
 	self.__tostring=Keydef.tostring
 	return obj
 end
+
 function Keydef:new(keycode,modifier,descr)
 	obj = Keydef:_new()
 	obj.keycode = keycode
@@ -20,13 +22,16 @@ function Keydef:new(keycode,modifier,descr)
 	obj.descr = descr
 	return obj
 end
+
 function Keydef:display()
 	return ((self.modifier and self.modifier.."+") or "")..(self.descr or "")
 end
+
 function Keydef:tostring()
 	return ((self.modifier and self.modifier.."+") or "").."["..(self.keycode or "").."]"..(self.descr or "")
 end
 
+
 Command = {
 	keydef = nil,
 	keygroup = nil,
@@ -34,6 +39,7 @@ Command = {
 	help = nil,
 	order = nil
 }
+
 function Command:_new(obj)
 	-- obj definition
 	obj = obj or {}
@@ -42,6 +48,7 @@ function Command:_new(obj)
 	self.__tostring=Command.tostring
 	return obj
 end
+
 function Command:new(keydef, func, help, keygroup, order)
 	obj = Command:_new()
 	obj.keydef = keydef
@@ -52,6 +59,7 @@ function Command:new(keydef, func, help, keygroup, order)
 	--print("creating command: ["..tostring(keydef).."] keygroup:["..(keygroup or "").."] help:"..help)
 	return obj
 end
+
 function Command:tostring()
 	return tostring(self.keydef)..": "..(self.help or "<no help defined>")
 end
@@ -61,6 +69,7 @@ Commands = {
 	map = {},
 	size = 0
 }
+
 function Commands:add(keycode,modifier,keydescr,help,func)
 	if type(keycode) == "table" then
 		for i=1,#keycode,1 do
@@ -72,11 +81,13 @@ function Commands:add(keycode,modifier,keydescr,help,func)
 		self:_addImpl(keydef,help,func)
 	end
 end
+
 function Commands:addGroup(keygroup,keys,help,func)
 	for _k,keydef in pairs(keys) do
 		self:_addImpl(keydef,help,func,keygroup)
 	end
 end
+
 function Commands:_addImpl(keydef,help,func,keygroup)
 	if keydef.modifier==MOD_ANY then
 		self:addGroup(keygroup or keydef.descr,{Keydef:new(keydef.keycode,nil), Keydef:new(keydef.keycode,MOD_SHIFT), Keydef:new(keydef.keycode,MOD_ALT)},help,func)
@@ -95,25 +106,32 @@ function Commands:_addImpl(keydef,help,func,keygroup)
 		end
 	end
 end
+
 function Commands:get(keycode,modifier)
 	return self.map[Keydef:new(keycode, modifier)]
 end
+
 function Commands:getByKeydef(keydef)
 	return self.map[keydef]
 end
+
 function Commands:new(obj)
-	-- payload
-	local mt = {}
-	setmetatable(self.map,mt)
-	mt.__index=function (table, key)
-		return rawget(table,(key.modifier or "").."@#@"..(key.keycode or ""))
-	end
-	mt.__newindex=function (table, key, value)
-		return rawset(table,(key.modifier or "").."@#@"..(key.keycode or ""),value)
-	end
 	-- obj definition
 	obj = obj or {}
+	obj.map = {}
+	obj.size = 0
 	setmetatable(obj, self)
 	self.__index = self
+
+	-- payload
+	local mt = {}
+	mt.__index = function(table, key)
+		return rawget(table,(key.modifier or "").."@#@"..(key.keycode or ""))
+	end
+	mt.__newindex = function(table, key, value)
+		return rawset(table,(key.modifier or "").."@#@"..(key.keycode or ""),value)
+	end
+	setmetatable(obj.map, mt)
+
 	return obj
 end