# HG changeset patch
# User madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
# Date 1366853385 0
# Node ID 6cb9a2936580fb353bab1d98144a153e1f8b4bab
# Parent  72b92b3e476ea325cf23e53a52583e9c001150cf
Miscellanous Lua code consistency improvements:
- no semicolon except between statements on same line
- use of implicit cast to bool in if/while conditions, instead of various eq/neq against true, false or nil
- no parenthesis around if/while conditions (C-ism)
- avoid long function calls in if conditions
- removed space in comma-separated expressions lists in multiple assignments
- added spaces between arguments of functions calls
- use tabs for indentation (in Lua files only)
- don't reverse == in if conditions, like "if 42==foo then" (C-ism)
- removed some extra parenthesis in complex expressions (C-ism)
- added spaces around operators in most expressions for ease of reading
- added comma after last element of table initializers
- removed space after # operator
- moved comment prefix of disabled code into tab (to keep disabled code aligned)

diff -r 72b92b3e476e -r 6cb9a2936580 CallbackFactory.lua
--- a/CallbackFactory.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/CallbackFactory.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: CalbackFactory.lua
 --~ Description: Creates lua callbacks that can be executed from a user keycombination
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -21,40 +21,40 @@
 CyborgMMO_CallbackFactory = {
 	new = function()
 		local self = {}
-		self.Frame = CreateFrame("Frame","CallbackFactoryFrame", UIParent);
+		self.Frame = CreateFrame("Frame", "CallbackFactoryFrame", UIParent)
 		self.Callbacks = {}
-		self.Id = 1;
+		self.Id = 1
 
 		self.AddCallback = function(fn)
 			local name = "Button"..self.Id
 			self.Callbacks[name] = CreateFrame("Button", name, self.Frame)
-			self.Callbacks[name]:SetScript("OnClick", fn);
-			self.Id = self.Id + 1;
-			return self.Callbacks[name], self.Frame, name;
+			self.Callbacks[name]:SetScript("OnClick", fn)
+			self.Id = self.Id + 1
+			return self.Callbacks[name],self.Frame,name
 		end
 
 		self.RemoveCallback = function(name)
 			self.Callbacks[name] = nil
 		end
-		
+
 		self.GetCallback = function(callbackName)
 			local callback = nil
-			if("Map" == callbackName) then
-				callback = self.ToggleMap;
-			elseif("CharacterPage" == callbackName) then
-				callback = self.ToggleCharacterPage;
-			elseif("Spellbook" == callbackName) then
-				callback = self.ToggleSpellbook;
-			elseif("Macros" == callbackName) then
-				callback = self.ToggleMacros;
-			elseif("QuestLog" == callbackName) then
-				callback = self.ToggleQuests;
-			elseif("Achievement" == callbackName) then
-				callback = self.ToggleAchievements;
-			elseif("Inventory" == callbackName) then
-				callback = self.ToggleBags; 
-			end;
-			return callback;
+			if callbackName == "Map" then
+				callback = self.ToggleMap
+			elseif callbackName == "CharacterPage" then
+				callback = self.ToggleCharacterPage
+			elseif callbackName == "Spellbook" then
+				callback = self.ToggleSpellbook
+			elseif callbackName == "Macros" then
+				callback = self.ToggleMacros
+			elseif callbackName == "QuestLog" then
+				callback = self.ToggleQuests
+			elseif callbackName == "Achievement" then
+				callback = self.ToggleAchievements
+			elseif callbackName == "Inventory" then
+				callback = self.ToggleBags
+			end
+			return callback
 		end
 
 
@@ -68,60 +68,58 @@
 
 		self.ToggleSpellbook = function()
 			ToggleFrame(SpellBookFrame)
-			if(SpellBookFrame:IsShown()) then
-				SpellbookMicroButton:SetButtonState("PUSHED", 1);
+			if SpellBookFrame:IsShown() then
+				SpellbookMicroButton:SetButtonState("PUSHED", 1)
 			else
-				SpellbookMicroButton:SetButtonState("NORMAL");
+				SpellbookMicroButton:SetButtonState("NORMAL")
 			end
 		end
 
 		self.ToggleMacros = function()
-			if(MacroFrame:IsShown() and MacroFrame:IsVisible()) then
-				HideUIPanel(MacroFrame);
+			if MacroFrame:IsShown() and MacroFrame:IsVisible() then
+				HideUIPanel(MacroFrame)
 			else
-				ShowMacroFrame();
+				ShowMacroFrame()
 			end
 		end
 
 		self.ToggleQuests = function()
-			ToggleFrame(QuestLogFrame);
-			if ( QuestLogFrame:IsShown() ) then
-				QuestLogMicroButton:SetButtonState("PUSHED", 1);
+			ToggleFrame(QuestLogFrame)
+			if QuestLogFrame:IsShown() then
+				QuestLogMicroButton:SetButtonState("PUSHED", 1)
 			else
-				QuestLogMicroButton:SetButtonState("NORMAL");
+				QuestLogMicroButton:SetButtonState("NORMAL")
 			end
 		end
 
 		self.ToggleAchievements = function()
-			ToggleAchievementFrame();
-			if ( AchievementFrame and AchievementFrame:IsShown() ) then
-				AchievementMicroButton:SetButtonState("PUSHED", 1);
+			ToggleAchievementFrame()
+			if AchievementFrame and AchievementFrame:IsShown() then
+				AchievementMicroButton:SetButtonState("PUSHED", 1)
 			else
-				if ( ( HasCompletedAnyAchievement() or IsInGuild() ) and CanShowAchievementUI() ) then
-					AchievementMicroButton:Enable();
-					AchievementMicroButton:SetButtonState("NORMAL");
+				if (HasCompletedAnyAchievement() or IsInGuild()) and CanShowAchievementUI() then
+					AchievementMicroButton:Enable()
+					AchievementMicroButton:SetButtonState("NORMAL")
 				else
-					AchievementMicroButton:Disable();
+					AchievementMicroButton:Disable()
 				end
 			end
 		end
 
 		self.ToggleBags = function()
-			ToggleAllBags();
+			ToggleAllBags()
 		end
-		return self;
+		return self
 	end,
 
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == CyborgMMO_CallbackFactory.m_Instance) then
-			CyborgMMO_CallbackFactory.m_Instance = CyborgMMO_CallbackFactory.new();
+		if not CyborgMMO_CallbackFactory.m_Instance then
+			CyborgMMO_CallbackFactory.m_Instance = CyborgMMO_CallbackFactory.new()
 		end
-		return CyborgMMO_CallbackFactory.m_Instance;
-	end
-
-
+		return CyborgMMO_CallbackFactory.m_Instance
+	end,
 }
 
 
diff -r 72b92b3e476e -r 6cb9a2936580 CyborgMMO7.lua
--- a/CyborgMMO7.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/CyborgMMO7.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: CyborgMMO7.lua
 --~ Description: Plugin entry point, String tables and other generic crap that I could not think to put anywhere else.
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -18,28 +18,24 @@
 --~ along with this program; if not, write to the Free Software
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-
-
-
-
 function CyborgMMO_LoadStrings(self)
 --~ 	msg("LoadStrings("..self:GetName()..") = "..CyborgMMO_StringTable[self:GetName()])
-	self:SetText(CyborgMMO_StringTable[self:GetName()]);
+	self:SetText(CyborgMMO_StringTable[self:GetName()])
 end
 
-local CyborgMMO_VarsLoaded = false;
-local CyborgMMO_EnteredWorld = false;
-local CyborgMMO_LoadBinding = false;
-local CyborgMMO_SaveName = GetRealmName().."_"..UnitName("player");
-local CyborgMMO_Settings = nil;
+local CyborgMMO_VarsLoaded = false
+local CyborgMMO_EnteredWorld = false
+local CyborgMMO_LoadBinding = false
+local CyborgMMO_SaveName = GetRealmName().."_"..UnitName("player")
+local CyborgMMO_Settings = nil
 
 
 function CyborgMMO_MiniMapButtonReposition(pos)
 	CyborgMMO_MiniMapFrame:SetPoint("TOPLEFT",
 		"Minimap",
 		"TOPLEFT",
-		52-(80*cos(pos)),
-		(80*sin(pos))-52)
+		52 - (80 * cos(pos)),
+		(80 * sin(pos)) - 52)
 end
 
 
@@ -51,225 +47,221 @@
 	xpos = (xmin)-(xpos / UIParent:GetScale())
 	ypos = (ypos/ UIParent:GetScale())-(ymin)
 
-	local degrees = math.deg(math.atan2(ypos,xpos));
+	local degrees = math.deg(math.atan2(ypos, xpos))
 
-	while(degrees < 0) do
-		degrees = degrees + 360;
+	while degrees < 0 do
+		degrees = degrees + 360
 	end
 
-
 	CyborgMMO_MiniMapButtonReposition(degrees)
 end
 
 function CyborgMMO_MouseModeChange(mode)
 	local MiniMapTexture = getglobal("CyborgMMO_MiniMapFrameButton_Icon")
 	local MiniMapGlowTexture = getglobal("CyborgMMO_MiniMapFrameButton_IconGlow")
-	local OpenButtonTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetNormalTexture();
-	local OpenButtonGlowTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetHighlightTexture();
-	if(1==mode) then
+	local OpenButtonTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetNormalTexture()
+	local OpenButtonGlowTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetHighlightTexture()
+	if mode == 1 then
 		MiniMapTexture:SetVertexColor(1,0,0,1)
-		--MiniMapGlowTexture:SetVertexColor(1,0.26,0.26,.75);
-		OpenButtonTexture:SetVertexColor(1,0,0,0.75);
-		--OpenButtonGlowTexture:SetVertexColor(1,0.26,0.26,0.50);
-	elseif(2==mode) then
+	--	MiniMapGlowTexture:SetVertexColor(1,0.26,0.26,.75)
+		OpenButtonTexture:SetVertexColor(1,0,0,0.75)
+	--	OpenButtonGlowTexture:SetVertexColor(1,0.26,0.26,0.50)
+	elseif mode == 2 then
 		MiniMapTexture:SetVertexColor(0.07,0.22,1,1)
-		MiniMapGlowTexture:SetVertexColor(0.13,0.56,1,.75);
-		OpenButtonTexture:SetVertexColor(0.07,0.22,1,0.75);
-		OpenButtonGlowTexture:SetVertexColor(0.13,0.56,1,0.5);
-	elseif(3==mode) then
+		MiniMapGlowTexture:SetVertexColor(0.13,0.56,1,.75)
+		OpenButtonTexture:SetVertexColor(0.07,0.22,1,0.75)
+		OpenButtonGlowTexture:SetVertexColor(0.13,0.56,1,0.5)
+	elseif mode == 3 then
 		MiniMapTexture:SetVertexColor(0.52,0.08,0.89,1)
-		MiniMapGlowTexture:SetVertexColor(0.67,0.31,0.85,.75);
-		OpenButtonTexture:SetVertexColor(0.52,0.08,0.89,0.75);
-		OpenButtonGlowTexture:SetVertexColor(0.67,0.31,0.85,0.5);
+		MiniMapGlowTexture:SetVertexColor(0.67,0.31,0.85,.75)
+		OpenButtonTexture:SetVertexColor(0.52,0.08,0.89,0.75)
+		OpenButtonGlowTexture:SetVertexColor(0.67,0.31,0.85,0.5)
 	end
 end
 
 function CyborgMMO_LoadWowCommands()
-	if (CyborgMMO_ProfileKeyBindings == nil) then
-		CyborgMMO_ProfileKeyBindings = {}
+	if not CyborgMMO_ProfileKeyBindings then
 		CyborgMMO_ProfileKeyBindings = CyborgMMO_DefaultWowCommands
 	end
-	CyborgMMO_WowCommands = CyborgMMO_ProfileKeyBindings 
+	CyborgMMO_WowCommands = CyborgMMO_ProfileKeyBindings
 end
 
 function CyborgMMO_GetSaveData()
-	if(CyborgMMO_VarsLoaded) then
-		if (CyborgMMO7SaveData == nil) then
-			CyborgMMO7SaveData = {};
+	if CyborgMMO_VarsLoaded then
+		if not CyborgMMO7SaveData then
+			CyborgMMO7SaveData = {}
 			CyborgMMO7SaveData[CyborgMMO_SaveName] = {}
 		end
 		CyborgMMO_LoadWowCommands()
-		return CyborgMMO7SaveData[CyborgMMO_SaveName];
+		return CyborgMMO7SaveData[CyborgMMO_SaveName]
 	end
-	return nil;
+	return nil
 end
 
 function CyborgMMO_SetSaveData(data, index)
-	if(CyborgMMO_VarsLoaded) then
+	if CyborgMMO_VarsLoaded then
 		CyborgMMO_GetSaveData()[index] = data
 		CyborgMMO_ProfileKeyBindings = CyborgMMO_WowCommands
 	end
 end
 
 function CyborgMMO_Event(self, event, ...)
-    if(event == "VARIABLES_LOADED") then
-		CyborgMMO_VarsLoaded = true;
-    elseif(event == "PLAYER_ENTERING_WORLD") then
-		CyborgMMO_EnteredWorld = true;
-    elseif(event == "PLAYER_ENTER_COMBAT") then
-		msg("PLAYER_ENTER_COMBAT");
-		CyborgMMO_Close();
-	elseif(event == nil) then
-		msg("Event is nil");
+	if event == "VARIABLES_LOADED" then
+		CyborgMMO_VarsLoaded = true
+	elseif event == "PLAYER_ENTERING_WORLD" then
+		CyborgMMO_EnteredWorld = true
+	elseif event == "PLAYER_ENTER_COMBAT" then
+		msg("PLAYER_ENTER_COMBAT")
+		CyborgMMO_Close()
 	else
-		msg("Event is " + event);
-    end
-
+		msg("Event is "..tostring(event))
+	end
 
 	-- Fire Loading if and only if the player is in the world and vars are loaded
-	if(false == CyborgMMO_LoadBinding) then
-		if(CyborgMMO_VarsLoaded) then
-			if(CyborgMMO_EnteredWorld) then
+	if not CyborgMMO_LoadBinding then
+		if CyborgMMO_VarsLoaded then
+			if CyborgMMO_EnteredWorld then
 				local data = CyborgMMO_GetSaveData()
 
-				CyborgMMO_RatPageModel.Instance().LoadData();
-				CyborgMMO_LoadBinding = true;
+				CyborgMMO_RatPageModel.Instance().LoadData()
+				CyborgMMO_LoadBinding = true
 
-				ShowMacroFrame();
-				HideUIPanel(MacroFrame);
+				ShowMacroFrame()
+				HideUIPanel(MacroFrame)
 
 
-				CyborgMMO_SetupModeCallbacks(1);
-				CyborgMMO_SetupModeCallbacks(2);
-				CyborgMMO_SetupModeCallbacks(3);
+				CyborgMMO_SetupModeCallbacks(1)
+				CyborgMMO_SetupModeCallbacks(2)
+				CyborgMMO_SetupModeCallbacks(3)
 
 
 				--Reload Slider values:
-				if(nil == data["Settings"]) then
+				if not data["Settings"] then
 					data["Settings"] = {}
-					data["Settings"]["Cyborg"] = 0.75;
-					data["Settings"]["Plugin"] = 0.75;
-					data["Settings"]["MiniMapButton"] = true;
-					data["Settings"]["CyborgButton"] = true;
+					data["Settings"]["Cyborg"] = 0.75
+					data["Settings"]["Plugin"] = 0.75
+					data["Settings"]["MiniMapButton"] = true
+					data["Settings"]["CyborgButton"] = true
 				end
 
-				CyborgMMO_Settings = data["Settings"];
+				CyborgMMO_Settings = data["Settings"]
 
-				CyborgMMO_OptionPageCyborgSizeSlider:SetValue(CyborgMMO_Settings["Cyborg"]);
+				CyborgMMO_OptionPageCyborgSizeSlider:SetValue(CyborgMMO_Settings["Cyborg"])
 				CyborgMMO_SetOpenButtonSize(CyborgMMO_Settings["Cyborg"])
-				CyborgMMO_OptionPagePluginSizeSlider:SetValue(CyborgMMO_Settings["Plugin"]);
-				CyborgMMO_SetMainPageSize(CyborgMMO_Settings["Plugin"]);
-				
+				CyborgMMO_OptionPagePluginSizeSlider:SetValue(CyborgMMO_Settings["Plugin"])
+				CyborgMMO_SetMainPageSize(CyborgMMO_Settings["Plugin"])
+
 				CyborgMMO_SetMiniMapButton(CyborgMMO_Settings["MiniMapButton"])
 				CyborgMMO_SetCyborgHeadButton(CyborgMMO_Settings["CyborgButton"])
 
-				local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom()
-				CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin,xmin)))
+				local xmin,ymin = Minimap:GetLeft(),Minimap:GetBottom()
+				CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin, xmin)))
 				-- Close the main window for now
-				CyborgMMO_Close();
+				CyborgMMO_Close()
 			end
 		end
 	end
 end
 
 function CyborgMMO_SetDefaultSettings()
-	CyborgMMO_OpenButtonPageOpenMainForm:ClearAllPoints();
-	CyborgMMO_MainPage:ClearAllPoints();
-	CyborgMMO_OpenButtonPageOpenMainForm:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
-	CyborgMMO_MainPage:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
+	CyborgMMO_OpenButtonPageOpenMainForm:ClearAllPoints()
+	CyborgMMO_MainPage:ClearAllPoints()
+	CyborgMMO_OpenButtonPageOpenMainForm:SetPoint("LEFT", UIParent, "LEFT", 0, 0)
+	CyborgMMO_MainPage:SetPoint("LEFT", UIParent, "LEFT", 0, 0)
 
-	CyborgMMO_SetOpenButtonSize(0.75);
-	CyborgMMO_SetMainPageSize(0.75);
-	CyborgMMO_SetMiniMapButton(true);
-	CyborgMMO_SetCyborgHeadButton(true);
+	CyborgMMO_SetOpenButtonSize(0.75)
+	CyborgMMO_SetMainPageSize(0.75)
+	CyborgMMO_SetMiniMapButton(true)
+	CyborgMMO_SetCyborgHeadButton(true)
 end
 
 
 function CyborgMMO_SetupModeCallbacks(modeNum)
 	fn = function()
-		CyborgMMO_MouseModeChange(modeNum);
+		CyborgMMO_MouseModeChange(modeNum)
 		CyborgMMO_RatPageModel.Instance().SetMode(modeNum)
 	end
 
-	local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(fn);
-	if(1 ~= SetOverrideBindingClick(parentFrame, true, CyborgMMO_Mode[modeNum], name, "LeftButton")) then
-		msg("Failed to Bind modeChange");
+	local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(fn)
+	local result = SetOverrideBindingClick(parentFrame, true, CyborgMMO_Mode[modeNum], name, "LeftButton")
+	if result ~= 1 then
+		msg("Failed to Bind modeChange")
 	end
 end
 
 function CyborgMMO_Loaded()
-    CyborgMMO_MainPage:RegisterEvent("VARIABLES_LOADED");
-		CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTERING_WORLD");
-    CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTER_COMBAT");
+	CyborgMMO_MainPage:RegisterEvent("VARIABLES_LOADED")
+	CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTERING_WORLD")
+	CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTER_COMBAT")
 end
 
 function CyborgMMO_Close()
-    CyborgMMO_MainPage:Hide();
-	if(CyborgMMO_Settings["CyborgButton"] == true) then
-		CyborgMMO_OpenButtonPage:Show();
+	CyborgMMO_MainPage:Hide()
+	if CyborgMMO_Settings["CyborgButton"] then
+		CyborgMMO_OpenButtonPage:Show()
 	end
 end
 
 function CyborgMMO_Open()
-	CyborgMMO_MainPage:Show();
-	CyborgMMO_RatQuickPage:Hide();
-	if(CyborgMMO_Settings["CyborgButton"] == true) then
-		CyborgMMO_OpenButtonPage:Show();
+	CyborgMMO_MainPage:Show()
+	CyborgMMO_RatQuickPage:Hide()
+	if CyborgMMO_Settings["CyborgButton"] then
+		CyborgMMO_OpenButtonPage:Show()
 	end
 end
 
 function CyborgMMO_IsOpen()
-	if(CyborgMMO_MainPage:IsVisible() == 1) then
-		return true;
+	if CyborgMMO_MainPage:IsVisible() == 1 then
+		return true
 	else
-		return false;
+		return false
 	end
 end
 
 function CyborgMMO_Toggle()
-	if(CyborgMMO_IsOpen()) then
-		CyborgMMO_Close();
+	if CyborgMMO_IsOpen() then
+		CyborgMMO_Close()
 	else
-		CyborgMMO_Open();
+		CyborgMMO_Open()
 	end
 end
 
 function msg(m)
-	local id, name = GetChannelName("Debug");
-	SendChatMessage(m, "CHANNEL", nil, id);
+	local id,name = GetChannelName("Debug")
+	SendChatMessage(m, "CHANNEL", nil, id)
 end
 
 function CyborgMMO_SetMainPageSize(percent)
-	if(CyborgMMO_VarsLoaded) then
-		if(CyborgMMO_EnteredWorld) then
-			CyborgMMO_MainPage:SetScale(percent);
-			CyborgMMO_Settings["Plugin"] = percent;
+	if CyborgMMO_VarsLoaded then
+		if CyborgMMO_EnteredWorld then
+			CyborgMMO_MainPage:SetScale(percent)
+			CyborgMMO_Settings["Plugin"] = percent
 			local data = CyborgMMO_GetSaveData()
 			data["Settings"] = CyborgMMO_Settings
-			CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent);
+			CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent)
 		end
 	end
 end
 
 function CyborgMMO_SetOpenButtonSize(percent)
-	if(CyborgMMO_VarsLoaded) then
-		if(CyborgMMO_EnteredWorld) then
+	if CyborgMMO_VarsLoaded then
+		if CyborgMMO_EnteredWorld then
 			CyborgMMO_OpenButtonPage:SetScale(percent)
-			CyborgMMO_Settings["Cyborg"] = percent;
+			CyborgMMO_Settings["Cyborg"] = percent
 			local data = CyborgMMO_GetSaveData()
 			data["Settings"] = CyborgMMO_Settings
-			CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent);
+			CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent)
 		end
 	end
 end
 
 function CyborgMMO_SetCyborgHeadButton(boolVal)
-	CyborgMMO_Settings["CyborgButton"] = boolVal;
-	CyborgMMO_OptionPageCyborgButton:SetChecked(boolVal);
-	if(CyborgMMO_Settings["CyborgButton"] == true) then
-		CyborgMMO_Close();
+	CyborgMMO_Settings["CyborgButton"] = boolVal
+	CyborgMMO_OptionPageCyborgButton:SetChecked(boolVal)
+	if CyborgMMO_Settings["CyborgButton"] then
+		CyborgMMO_Close()
 	else
-		CyborgMMO_OpenButtonPage:Hide();
+		CyborgMMO_OpenButtonPage:Hide()
 	end
 	local data = CyborgMMO_GetSaveData()
 	data["Settings"] = CyborgMMO_Settings
@@ -277,9 +269,8 @@
 
 function CyborgMMO_SetMiniMapButton(boolVal)
 	CyborgMMO_Settings["MiniMapButton"] = boolVal
-	CyborgMMO_Settings["MiniMapButton"] = boolVal
 	CyborgMMO_OptionPageMiniMapButton:SetChecked(boolVal)
-	if(CyborgMMO_Settings["MiniMapButton"] == true) then
+	if CyborgMMO_Settings["MiniMapButton"] then
 		CyborgMMO_MiniMapFrameButton:Show()
 	else
 		CyborgMMO_MiniMapFrameButton:Hide()
diff -r 72b92b3e476e -r 6cb9a2936580 MainPage.xml
--- a/MainPage.xml	Tue Apr 16 15:19:23 2013 +0000
+++ b/MainPage.xml	Thu Apr 25 01:29:45 2013 +0000
@@ -25,16 +25,16 @@
 	<Button name="CyborgMMO_TemplateCallbackButton" virtual="true" inherits="CyborgMMO_TemplateIcon">
 		<Scripts>
 			<OnLoad>
-				self = CyborgMMO_CallbackIcons.new(self);
+				self = CyborgMMO_CallbackIcons.new(self)
 			</OnLoad>
 			<OnClick>
-				self.OnClick();
+				self.OnClick()
 			</OnClick>
 			<OnDragStart>
-				self.DragStart();
+				self.DragStart()
 			</OnDragStart>
 			<OnDragStop>
-				self.DragStop();
+				self.DragStop()
 			</OnDragStop>
 		</Scripts>
 	</Button>
@@ -192,8 +192,8 @@
 			</Frame>
 		</Frames>
 		<Scripts>
-			<OnLoad>CyborgMMO_Loaded();</OnLoad>
-			<OnEvent>CyborgMMO_Event(this, event,...);</OnEvent>
+			<OnLoad>CyborgMMO_Loaded()</OnLoad>
+			<OnEvent>CyborgMMO_Event(this, event, ...)</OnEvent>
 		</Scripts>
 	</Frame>
 </Ui>
diff -r 72b92b3e476e -r 6cb9a2936580 OpenButtonPage.xml
--- a/OpenButtonPage.xml	Tue Apr 16 15:19:23 2013 +0000
+++ b/OpenButtonPage.xml	Thu Apr 25 01:29:45 2013 +0000
@@ -55,18 +55,18 @@
 			</Anchors>
 			<Scripts>
 				<OnLoad>
-					self:RegisterForDrag("LeftButton","RightButton")
+					self:RegisterForDrag("LeftButton", "RightButton")
 				</OnLoad>
 				<OnClick>
-					CyborgMMO_Toggle();
+					CyborgMMO_Toggle()
 				</OnClick>
 				<OnDragStart>
-					self:StartMoving();
-					self.isMoving = true;
+					self:StartMoving()
+					self.isMoving = true
 				</OnDragStart>
 				<OnDragStop>
-					self:StopMovingOrSizing();
-					self.isMoving = false;
+					self:StopMovingOrSizing()
+					self.isMoving = false
 				</OnDragStop>
 				<OnEnter>
 					CyborgMMO_ShowProfileTooltip(self:GetNormalTexture())
@@ -160,19 +160,19 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						self:RegisterForDrag("LeftButton","RightButton")
+						self:RegisterForDrag("LeftButton", "RightButton")
 					</OnLoad>
 					<OnMouseDown>
 					</OnMouseDown>
 					<OnMouseUp>
-						CyborgMMO_Toggle();
-						if(false == CyborgMMO_IsOpen()) then
-							CyborgMMO_RatQuickPage:Show();
+						CyborgMMO_Toggle()
+						if not CyborgMMO_IsOpen() then
+							CyborgMMO_RatQuickPage:Show()
 						end
 					 </OnMouseUp>
 					<OnEnter>
-						if(false == CyborgMMO_IsOpen()) then
-							CyborgMMO_RatQuickPage:Show();
+						if not CyborgMMO_IsOpen() then
+							CyborgMMO_RatQuickPage:Show()
 						end
 						CyborgMMO_ShowProfileTooltip(getglobal(self:GetName().."_Icon"))
 					</OnEnter>
@@ -181,8 +181,8 @@
 						CyborgMMO_HideProfileTooltip()
 					</OnLeave>
 					<OnUpdate>
-						if(self:IsDragging()) then
-							CyborgMMO_MiniMapButtonOnUpdate();
+						if self:IsDragging() then
+							CyborgMMO_MiniMapButtonOnUpdate()
 						end
 					</OnUpdate>
 				</Scripts>
diff -r 72b92b3e476e -r 6cb9a2936580 OptionPage.xml
--- a/OptionPage.xml	Tue Apr 16 15:19:23 2013 +0000
+++ b/OptionPage.xml	Thu Apr 25 01:29:45 2013 +0000
@@ -55,8 +55,8 @@
 		self:RegisterEvent("VARIABLES_LOADED")
 	</OnLoad>
 	<OnEvent>
-		if(event == "VARIABLES_LOADED") then
-			CyborgMMO_GetBindingButtonText(self:GetName());
+		if event == "VARIABLES_LOADED" then
+			CyborgMMO_GetBindingButtonText(self:GetName())
 		end
 	</OnEvent>
 	<OnClick>
@@ -136,7 +136,7 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				CyborgMMO_LoadStrings(getglobal(self:GetName().."Name"));
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Name"))
 			</OnLoad>
 		</Scripts>
 	</Frame>
@@ -346,10 +346,10 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 					</OnLoad>
 					<OnClick>
-						if(self:GetChecked() == 1) then
+						if self:GetChecked() == 1 then
 							CyborgMMO_SetMiniMapButton(true)
 						else
 							CyborgMMO_SetMiniMapButton(false)
@@ -385,10 +385,10 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 					</OnLoad>
 					<OnClick>
-						if(self:GetChecked() == 1) then
+						if self:GetChecked() == 1 then
 							CyborgMMO_SetCyborgHeadButton(true)
 						else
 							CyborgMMO_SetCyborgHeadButton(false)
@@ -410,10 +410,10 @@
 				</Anchors>
 				<Scripts>
 					<OnLoad>
-						CyborgMMO_LoadStrings(getglobal(self:GetName()));
+						CyborgMMO_LoadStrings(getglobal(self:GetName()))
 					</OnLoad>
 					<OnClick>
-						CyborgMMO_SetDefaultSettings();
+						CyborgMMO_SetDefaultSettings()
 					</OnClick>
 				</Scripts>
 			</Button>
@@ -560,7 +560,7 @@
 						</ThumbTexture>
 						<Scripts>
 							<OnLoad>
-								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
+								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 							</OnLoad>
 							<OnValueChanged>
 								CyborgMMO_SetMainPageSize(self:GetValue())
@@ -573,9 +573,9 @@
 
 		<Scripts>
 			<OnLoad>
-				CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
-				msg("Loaded Option Page");
-				self = CyborgMMO_OptionView.new(self);
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
+				msg("Loaded Option Page")
+				self = CyborgMMO_OptionView.new(self)
 			</OnLoad>
 		</Scripts>
 	</Frame>
@@ -671,7 +671,7 @@
         </Anchors>
         <Scripts>
           <OnClick>
-            HideUIPanel(self:GetParent());
+            HideUIPanel(self:GetParent())
           </OnClick>
         </Scripts>
       </Button>
@@ -681,19 +681,19 @@
       <OnLoad>
 			CyborgMMO_LoadStrings(getglobal(self:GetName().."HeaderText"))
 			CyborgMMO_LoadStrings(getglobal(self:GetName().."ExitButton"))
-        self:RegisterForClicks("AnyUp");
+        self:RegisterForClicks("AnyUp")
       </OnLoad>
       <OnClick>
-        CyborgMMO_BindingFrameOnKeyDown(self, button);
+        CyborgMMO_BindingFrameOnKeyDown(self, button)
       </OnClick>
       <OnKeyDown>
-        CyborgMMO_BindingFrameOnKeyDown(self, key);
+        CyborgMMO_BindingFrameOnKeyDown(self, key)
       </OnKeyDown>
       <OnMouseWheel>
-        if (delta > 0) then
-          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELUP");
+        if delta > 0 then
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELUP")
         else
-          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELDOWN");
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELDOWN")
         end
       </OnMouseWheel>
     </Scripts>
diff -r 72b92b3e476e -r 6cb9a2936580 OptionView.lua
--- a/OptionView.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/OptionView.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: OptionView.lua
 --~ Description: The code for the Option page in the UI, not much here because we dont have many options. Probably could refactor.
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -20,11 +20,10 @@
 
 CyborgMMO_OptionView = {
 	new = function(self)
-        self.name = "Cyborg MMO7 Plugin"
-        InterfaceOptions_AddCategory(self);
+		self.name = "Cyborg MMO7 Plugin"
+		InterfaceOptions_AddCategory(self)
 		return self
-
-	end
+	end,
 }
 
 local lastButton = nil
@@ -33,23 +32,22 @@
 	lastButton = name
 	local index = CyborgMMO_GetButtonIndex(name)
 	local mode = 1
-	while(index > 13) do
+	while index > 13 do
 		mode = mode + 1
 		index = index - 13
 	end
-	local buttonStr =  CyborgMMO_StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")]
-	
+	local buttonStr = CyborgMMO_StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")]
+
 	getglobal("CyborgMMO_BindingFrameButtonName"):SetText(buttonStr.." Mode "..mode)
 	getglobal("CyborgMMO_BindingFrameKey"):SetText(CyborgMMO_StringTable["CyborgMMO_CurrentBinding"].." "..CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)])
 	CyborgMMO_BindingFrame:Show()
-	
 end
 
 function CyborgMMO_GetBindingButtonText(name)
-	if(nil == CyborgMMO_WowCommands) then
-		CyborgMMO_LoadWowCommands();
+	if not CyborgMMO_WowCommands then
+		CyborgMMO_LoadWowCommands()
 	end
-	
+
 	local binding = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(name)]
 	getglobal(name):SetText(binding)
 end
@@ -62,157 +60,156 @@
 end
 
 function CyborgMMO_ShowProfileTooltip(self)
-	local red, green, blue, _ = self:GetVertexColor()
-	if((red == 0) and (green == 0) and (blue == 0)) then
-		GameTooltip:SetOwner(self:GetParent(), "ANCHOR_RIGHT");
-		GameTooltip:SetText(CyborgMMO_StringTable["CyborgMMO_ToolTipLine1"], nil, nil, nil, nil, 1);
-		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine2"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine3"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine4"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine5"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine6"], 0.8, 1.0, 0.8);
-		GameTooltip:Show();
+	local red,green,blue = self:GetVertexColor()
+	if red == 0 and green == 0 and blue == 0 then
+		GameTooltip:SetOwner(self:GetParent(), "ANCHOR_RIGHT")
+		GameTooltip:SetText(CyborgMMO_StringTable["CyborgMMO_ToolTipLine1"], nil, nil, nil, nil, 1)
+		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine2"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine3"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine4"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine5"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine6"], 0.8, 1.0, 0.8)
+		GameTooltip:Show()
 	end
 end
 
 function CyborgMMO_HideProfileTooltip(self)
-	GameTooltip:Hide();
+	GameTooltip:Hide()
 end
 
 function CyborgMMO_GetNumberFromHexLetter(str)
 	local number = 0
-	if("A" == str) then
+	if str == "A" then
 		number = 10
-	elseif("B" == str) then
+	elseif str == "B" then
 		number = 11
-	elseif("C" == str) then
+	elseif str == "C" then
 		number = 12
-	elseif("D" == str) then
+	elseif str == "D" then
 		number = 13
-	elseif("E" == str) then
+	elseif str == "E" then
 		number = 14
-	elseif("F" == str) then
+	elseif str == "F" then
 		number = 15
-	else 
-	 number = tonumber(str)
+	else
+		number = tonumber(str)
 	end
 	return number
 end
 
 function CyborgMMO_SetNewKeybind(keyOrButton)
 	local previous = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)]
-	CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton;
-	CyborgMMO_GetBindingButtonText(lastButton);
+	CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton
+	CyborgMMO_GetBindingButtonText(lastButton)
 	CyborgMMO_BindingFrame:Hide()
 	CyborgMMO_RatPageModel.Instance().LoadData()
 end
 
 function CyborgMMO_BindingFrameOnKeyDown(self, keyOrButton)
-   if keyOrButton=="ESCAPE" then
-      CyborgMMO_BindingFrame:Hide()
-      return
-   end
-   
-   if ( GetBindingFromClick(keyOrButton) == "SCREENSHOT" ) then
-      RunBinding("SCREENSHOT");
-      return;
-   end
-   
-   local keyPressed = keyOrButton;
-   
-   if ( keyPressed == "UNKNOWN" ) then
-      return;
-   end
-   
-   -- Convert the mouse button names
-   if ( keyPressed == "LeftButton" ) then
-      keyPressed = "BUTTON1";
-   elseif ( keyPressed == "RightButton" ) then
-      keyPressed = "BUTTON2";
-   elseif ( keyPressed == "MiddleButton" ) then
-      keyPressed = "BUTTON3";
-   elseif ( keyPressed == "Button4" ) then
-      keyPressed = "BUTTON4"
-   elseif ( keyOrButton == "Button5" ) then
-      keyPressed = "BUTTON5"
-   elseif ( keyPressed == "Button6" ) then
-      keyPressed = "BUTTON6"
-   elseif ( keyOrButton == "Button7" ) then
-      keyPressed = "BUTTON7"
-   elseif ( keyPressed == "Button8" ) then
-      keyPressed = "BUTTON8"
-   elseif ( keyOrButton == "Button9" ) then
-      keyPressed = "BUTTON9"
-   elseif ( keyPressed == "Button10" ) then
-      keyPressed = "BUTTON10"
-   elseif ( keyOrButton == "Button11" ) then
-      keyPressed = "BUTTON11"
-   elseif ( keyPressed == "Button12" ) then
-      keyPressed = "BUTTON12"
-   elseif ( keyOrButton == "Button13" ) then
-      keyPressed = "BUTTON13"
-   elseif ( keyPressed == "Button14" ) then
-      keyPressed = "BUTTON14"
-   elseif ( keyOrButton == "Button15" ) then
-      keyPressed = "BUTTON15"
-   elseif ( keyPressed == "Button16" ) then
-      keyPressed = "BUTTON16"
-   elseif ( keyOrButton == "Button17" ) then
-      keyPressed = "BUTTON17"
-   elseif ( keyPressed == "Button18" ) then
-      keyPressed = "BUTTON18"
-   elseif ( keyOrButton == "Button19" ) then
-      keyPressed = "BUTTON19"
-   elseif ( keyPressed == "Button20" ) then
-      keyPressed = "BUTTON20"
-   elseif ( keyOrButton == "Button21" ) then
-      keyPressed = "BUTTON21"
-   elseif ( keyPressed == "Button22" ) then
-      keyPressed = "BUTTON22"
-   elseif ( keyOrButton == "Button23" ) then
-      keyPressed = "BUTTON23"
-   elseif ( keyPressed == "Button24" ) then
-      keyPressed = "BUTTON24"
-   elseif ( keyOrButton == "Button25" ) then
-      keyPressed = "BUTTON25"
-   elseif ( keyPressed == "Button26" ) then
-      keyPressed = "BUTTON26"
-   elseif ( keyOrButton == "Button27" ) then
-      keyPressed = "BUTTON27"
-   elseif ( keyPressed == "Button28" ) then
-      keyPressed = "BUTTON28"
-   elseif ( keyOrButton == "Button29" ) then
-      keyPressed = "BUTTON29"
-   elseif ( keyPressed == "Button30" ) then
-      keyPressed = "BUTTON30"
-   elseif ( keyOrButton == "Button31" ) then
-      keyPressed = "BUTTON31"
-   end
-   
-   if ( keyPressed == "LSHIFT" or
-	keyPressed == "RSHIFT" or
-	keyPressed == "LCTRL" or
-	keyPressed == "RCTRL" or
-	keyPressed == "LALT" or
-	keyPressed == "RALT" ) then
-      return;
-   end
-   if ( IsShiftKeyDown() ) then
-      keyPressed = "SHIFT-"..keyPressed
-   end
-   if ( IsControlKeyDown() ) then
-      keyPressed = "CTRL-"..keyPressed
-   end
-   if ( IsAltKeyDown() ) then
-      keyPressed = "ALT-"..keyPressed
-   end
-   if ( keyPressed == "BUTTON1" or keyPressed == "BUTTON2" ) then
-      return;
-   end
-	 
-	 CyborgMMO_SetNewKeybind(keyPressed)
-	 
+	if keyOrButton == "ESCAPE" then
+		CyborgMMO_BindingFrame:Hide()
+		return
+	end
+
+	if GetBindingFromClick(keyOrButton) == "SCREENSHOT" then
+		RunBinding("SCREENSHOT")
+		return
+	end
+
+	local keyPressed = keyOrButton
+
+	if keyPressed == "UNKNOWN" then
+		return
+	end
+
+	-- Convert the mouse button names
+	if keyPressed == "LeftButton" then
+		keyPressed = "BUTTON1"
+	elseif keyPressed == "RightButton" then
+		keyPressed = "BUTTON2"
+	elseif keyPressed == "MiddleButton" then
+		keyPressed = "BUTTON3"
+	elseif keyPressed == "Button4" then
+		keyPressed = "BUTTON4"
+	elseif keyOrButton == "Button5" then
+		keyPressed = "BUTTON5"
+	elseif keyPressed == "Button6" then
+		keyPressed = "BUTTON6"
+	elseif keyOrButton == "Button7" then
+		keyPressed = "BUTTON7"
+	elseif keyPressed == "Button8" then
+		keyPressed = "BUTTON8"
+	elseif keyOrButton == "Button9" then
+		keyPressed = "BUTTON9"
+	elseif keyPressed == "Button10" then
+		keyPressed = "BUTTON10"
+	elseif keyOrButton == "Button11" then
+		keyPressed = "BUTTON11"
+	elseif keyPressed == "Button12" then
+		keyPressed = "BUTTON12"
+	elseif keyOrButton == "Button13" then
+		keyPressed = "BUTTON13"
+	elseif keyPressed == "Button14" then
+		keyPressed = "BUTTON14"
+	elseif keyOrButton == "Button15" then
+		keyPressed = "BUTTON15"
+	elseif keyPressed == "Button16" then
+		keyPressed = "BUTTON16"
+	elseif keyOrButton == "Button17" then
+		keyPressed = "BUTTON17"
+	elseif keyPressed == "Button18" then
+		keyPressed = "BUTTON18"
+	elseif keyOrButton == "Button19" then
+		keyPressed = "BUTTON19"
+	elseif keyPressed == "Button20" then
+		keyPressed = "BUTTON20"
+	elseif keyOrButton == "Button21" then
+		keyPressed = "BUTTON21"
+	elseif keyPressed == "Button22" then
+		keyPressed = "BUTTON22"
+	elseif keyOrButton == "Button23" then
+		keyPressed = "BUTTON23"
+	elseif keyPressed == "Button24" then
+		keyPressed = "BUTTON24"
+	elseif keyOrButton == "Button25" then
+		keyPressed = "BUTTON25"
+	elseif keyPressed == "Button26" then
+		keyPressed = "BUTTON26"
+	elseif keyOrButton == "Button27" then
+		keyPressed = "BUTTON27"
+	elseif keyPressed == "Button28" then
+		keyPressed = "BUTTON28"
+	elseif keyOrButton == "Button29" then
+		keyPressed = "BUTTON29"
+	elseif keyPressed == "Button30" then
+		keyPressed = "BUTTON30"
+	elseif keyOrButton == "Button31" then
+		keyPressed = "BUTTON31"
+	end
+
+	if keyPressed == "LSHIFT" or
+	   keyPressed == "RSHIFT" or
+	   keyPressed == "LCTRL" or
+	   keyPressed == "RCTRL" or
+	   keyPressed == "LALT" or
+	   keyPressed == "RALT" then
+		return
+	end
+	if IsShiftKeyDown() then
+		keyPressed = "SHIFT-"..keyPressed
+	end
+	if IsControlKeyDown() then
+		keyPressed = "CTRL-"..keyPressed
+	end
+	if IsAltKeyDown() then
+		keyPressed = "ALT-"..keyPressed
+	end
+	if keyPressed == "BUTTON1" or keyPressed == "BUTTON2" then
+		return
+	end
+
+	CyborgMMO_SetNewKeybind(keyPressed)
 end
diff -r 72b92b3e476e -r 6cb9a2936580 RatPage.xml
--- a/RatPage.xml	Tue Apr 16 15:19:23 2013 +0000
+++ b/RatPage.xml	Thu Apr 25 01:29:45 2013 +0000
@@ -51,11 +51,11 @@
 	<Button name="CyborgMMO_TemplateSlot" inherits="CyborgMMO_TemplateIcon" virtual="true">
 		<Scripts>
 			<OnLoad>
-				self = CyborgMMO_SlotView.new(self);
+				self = CyborgMMO_SlotView.new(self)
 			</OnLoad>
 			<OnMouseDown>
-				if(button == "LeftButton") then
-					self.Clicked();
+				if button == "LeftButton" then
+					self.Clicked()
 				end
 			</OnMouseDown>
 
@@ -78,10 +78,10 @@
 		<DisabledFont style="GameFontDisable" />
 		<Scripts>
 			<OnLoad>
-				self = CyborgMMO_ModeView.new(self);
+				self = CyborgMMO_ModeView.new(self)
 			</OnLoad>
 			<OnClick>
-				self.Clicked();
+				self.Clicked()
 			</OnClick>
 		</Scripts>
 	</Button>
@@ -473,7 +473,7 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				self = CyborgMMO_RatPageView.new(self);
+				self = CyborgMMO_RatPageView.new(self)
 			</OnLoad>
 		</Scripts>
 	</Frame>
diff -r 72b92b3e476e -r 6cb9a2936580 RatPageController.lua
--- a/RatPageController.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/RatPageController.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: RatPageController.lua
 --~ Description: Controller logic for the RatPage
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -20,67 +20,64 @@
 
 CyborgMMO_RatPageController = {
 	new = function()
-		local self = {};
-		CyborgMMO_RatPageModel.Instance().SetMode(1);
+		local self = {}
+		CyborgMMO_RatPageModel.Instance().SetMode(1)
 
 		self.SlotClicked = function(slot)
 			local slotObject = nil
 			slotObject = CyborgMMO_RatPageModel.Instance().GetObjectOnButton(slot.Id)
-			CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), self.GetCursorObject());
+			CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), self.GetCursorObject())
 
-			if(slotObject ~= nil) then
-				slotObject.Pickup();
+			if slotObject then
+				slotObject.Pickup()
 			end
-
 		end
 
 		self.ModeClicked = function(mode)
-			msg("Setting mode "..tostring(mode.Id));
-			CyborgMMO_RatPageModel.Instance().SetMode(mode.Id);
+			msg("Setting mode "..tostring(mode.Id))
+			CyborgMMO_RatPageModel.Instance().SetMode(mode.Id)
 		end
 
 		self.GetCursorObject = function()
-			local cursorObject = nil;
-			if(nil ~= GetCursorInfo()) then
-				local type, detail, subdetail = GetCursorInfo();
-				cursorObject = CyborgMMO_WowObject.Create(type, detail, subdetail);
-				ClearCursor();
+			local cursorObject = nil
+			if GetCursorInfo() then
+				local type,detail,subdetail = GetCursorInfo()
+				cursorObject = CyborgMMO_WowObject.Create(type, detail, subdetail)
+				ClearCursor()
 			end
-			return cursorObject;
+			return cursorObject
 		end
-		
+
 		self.CallbackDropped = function(callbackObject)
-			local slot = nil;
-			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers();
-			for i = 1, (# observers) do
-				if(MouseIsOver(observers[i])) then
-					slot = observers[i];
-					break;
+			local slot = nil
+			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers()
+			for i=1,#observers do
+				if MouseIsOver(observers[i]) then
+					slot = observers[i]
+					break
 				end
 			end
-			if(nil ~= slot) then 
-				CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), callbackObject.wowObject);
+			if slot then
+				CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), callbackObject.wowObject)
 			end
 		end
-		
-		
 
 		self.Close = function()
-
 		end
 
 		self.Open = function()
 		end
 
-		return self;
+		return self
 	end,
 
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == CyborgMMO_RatPageController.m_Instance) then
-			CyborgMMO_RatPageController.m_Instance = CyborgMMO_RatPageController.new();
+		if not CyborgMMO_RatPageController.m_Instance then
+			CyborgMMO_RatPageController.m_Instance = CyborgMMO_RatPageController.new()
 		end
-		return CyborgMMO_RatPageController.m_Instance;
-	end
+		return CyborgMMO_RatPageController.m_Instance
+	end,
 }
+
diff -r 72b92b3e476e -r 6cb9a2936580 RatPageModel.lua
--- a/RatPageModel.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/RatPageModel.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: RatPageModel.lua
 --~ Description: Code model of the MMO7 mouse
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -19,102 +19,104 @@
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -- Constants --
 
-local RAT7 = { BUTTONS = 13, MODES = 3, SHIFT = 0}
+local RAT7 = {
+	BUTTONS = 13,
+	MODES = 3,
+	SHIFT = 0,
+}
 
-local MIDDLEMOUSE = 1;
+local MIDDLEMOUSE = 1
 
 CyborgMMO_RatPageModel = {
 	new = function()
-	local self = {}
-		self.m_Mode = 1;
-		self.ObserverCount = 0;
+		local self = {}
+		self.m_Mode = 1
+		self.ObserverCount = 0
 		self.ObserverList = {}
 		self.Data = {}
 
-		for i = 1,RAT7.MODES do
+		for i=1,RAT7.MODES do
 			self.Data[i] = {}
-			for j = 1, RAT7.BUTTONS do
-				self.Data[i][j] = {};
+			for j=1,RAT7.BUTTONS do
+				self.Data[i][j] = {}
 			end
 		end
 
 		self.InitSaveData = function(data)
-			for i = 1,RAT7.MODES do
-				if (nil == data["Rat"][i]) then
+			for i=1,RAT7.MODES do
+				if not data["Rat"][i] then
 					data["Rat"][i] = {}
 				end
-				for j = 1, RAT7.BUTTONS do
-					if (nil == data["Rat"][i][j]) then
+				for j=1,RAT7.BUTTONS do
+					if not data["Rat"][i][j] then
 						data["Rat"][i][j] = {}
 					end
 				end
 			end
 		end
 
-
 		self.LoadData = function()
 			msg("Loading...")
-			local data = CyborgMMO_GetSaveData();
+			local data = CyborgMMO_GetSaveData()
 
-
-			if (nil == data["Rat"]) then
+			if not data["Rat"] then
 				data["Rat"] = {}
-				self.InitSaveData(data);
+				self.InitSaveData(data)
 			end
 
 			self.Data = data["Rat"]
-			if(data ~= nil) then
-				for mode = 1,RAT7.MODES do
-					for button = 1, RAT7.BUTTONS do
-						if(self.Data[mode][button] ~= nil) then
-							object = CyborgMMO_WowObject.Create(self.Data[mode][button].Type, self.Data[mode][button].Detail, self.Data[mode][button].Subdetail);
-							self.SetObjectOnButtonNoUpdate(button, mode, object);
+			if data then
+				for mode=1,RAT7.MODES do
+					for button=1,RAT7.BUTTONS do
+						if self.Data[mode][button] then
+							object = CyborgMMO_WowObject.Create(self.Data[mode][button].Type, self.Data[mode][button].Detail, self.Data[mode][button].Subdetail)
+							self.SetObjectOnButtonNoUpdate(button, mode, object)
 						else
-							object = CyborgMMO_WowObject.Create("", "", "");
-							self.SetObjectOnButtonNoUpdate(button, mode, object);
-							self.Data[mode][button] = object;
+							object = CyborgMMO_WowObject.Create("", "", "")
+							self.SetObjectOnButtonNoUpdate(button, mode, object)
+							self.Data[mode][button] = object
 						end
 					end
 				end
-				self.UpdateObservers();
+				self.UpdateObservers()
 			end
 		end
 
 		self.SaveData = function()
 			msg("Saving...")
-			CyborgMMO_SetSaveData(self.Data, "Rat");
+			CyborgMMO_SetSaveData(self.Data, "Rat")
 		end
 
 		self.SetMode = function(mode)
-			self.m_Mode = mode;
-			self.UpdateObservers();
+			self.m_Mode = mode
+			self.UpdateObservers()
 		end
 
 		self.GetMode = function()
-			return self.m_Mode;
+			return self.m_Mode
 		end
 
 		self.GetData = function()
-			return self.Data, self.m_Mode;
+			return self.Data,self.m_Mode
 		end
 
 		self.GetObjectOnButton = function(button)
-			if(nil == self.Data[self.m_Mode][button]) then
-				return nil;
+			if not self.Data[self.m_Mode][button] then
+				return nil
 			else
 				return self.Data[self.m_Mode][button]
 			end
 		end
 
 		self.SetObjectOnButtonNoUpdate = function(button, mode, object)
-			--msg("button = "..tostring(button).." mode = "..tostring(mode))
-			self.Data[mode][button] = object;
+		--	msg("button = "..tostring(button).." mode = "..tostring(mode))
+			self.Data[mode][button] = object
 
-			if(nil ~= object) then
-				object.SetBinding(CyborgMMO_WowCommands[((mode-1)*RAT7.BUTTONS)+button]);
+			if object then
+				object.SetBinding(CyborgMMO_WowCommands[((mode-1)*RAT7.BUTTONS)+button])
 				if("callback" == object.Type) then
 					msg("trying to set texture")
-					local slot = getglobal("CyborgMMO_MainPageSlotListSlot"..button);
+					local slot = getglobal("CyborgMMO_MainPageSlotListSlot"..button)
 					slot:SetNormalTexture(object.Texture)
 				end
 			else
@@ -124,34 +126,36 @@
 		end
 
 		self.SetObjectOnButton = function(button, mode, object)
-			self.SetObjectOnButtonNoUpdate(button, mode, object);
+			self.SetObjectOnButtonNoUpdate(button, mode, object)
 			self.UpdateObservers()
 		end
 
 		self.AddObserver = function(view)
-			table.insert(self.ObserverList,view)
-			self.observerCount = # self.ObserverList
+			table.insert(self.ObserverList, view)
+			self.observerCount = #self.ObserverList
 		end
-		
+
 		self.GetAllObservers = function()
-			return self.ObserverList;
+			return self.ObserverList
 		end
 
 		self.UpdateObservers = function()
-			for i = 1, (# self.ObserverList) do
+			for i=1,#self.ObserverList do
 				self.ObserverList[i].Update(self.Data, self.m_Mode)
 			end
 			self.SaveData()
 		end
-	return self;
+
+		return self
 	end,
 
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == CyborgMMO_RatPageModel.m_Instance) then
-			CyborgMMO_RatPageModel.m_Instance = CyborgMMO_RatPageModel.new();
+		if not CyborgMMO_RatPageModel.m_Instance then
+			CyborgMMO_RatPageModel.m_Instance = CyborgMMO_RatPageModel.new()
 		end
-		return CyborgMMO_RatPageModel.m_Instance;
-	end
+		return CyborgMMO_RatPageModel.m_Instance
+	end,
 }
+
diff -r 72b92b3e476e -r 6cb9a2936580 RatPageView.lua
--- a/RatPageView.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/RatPageView.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: RatPageView.lua
 --~ Description: Interaction logic for the RatPage
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -20,11 +20,11 @@
 
 CyborgMMO_RatPageView = {
 	new = function(self)
-		msg("new Rat Page View");
-		for _, child in ipairs(self:GetChildren()) do
-			child.Register();
+		msg("new Rat Page View")
+		for _,child in ipairs(self:GetChildren()) do
+			child.Register()
 		end
-		
+
 		self.SlotClicked = function(slot)
 			msg("View Recieved Click")
 			CyborgMMO_RatPageController.Instance().SlotClicked(slot)
@@ -42,116 +42,114 @@
 		self.RegisterSlot = function()
 			msg("SlotRegistered")
 		end
-		return self;
-	end
+
+		return self
+	end,
 }
 
 CyborgMMO_RatQuickPageView = {
 	new = function(self)
-		for _, child in ipairs(self:GetChildren()) do
-			child.Register();
+		for _,child in ipairs(self:GetChildren()) do
+			child.Register()
 		end
 
 		self.SlotClicked = function(slot)
 			CyborgMMO_RatPageController.Instance().SlotClicked(slot)
 		end
 
-		return self;
-	end
+		return self
+	end,
 }
 
 -- Slot Class --
 CyborgMMO_SlotView = {
 	new = function(self, parent)
-		self._assignedWowObject = nil;
-		self:RegisterForClicks("LeftButtonUp", "RightButtonUp");
-		self.Id = self:GetID();
-		CyborgMMO_RatPageModel.Instance().AddObserver(self);
-		self.UnCheckedTexture = self:GetNormalTexture();
+		self._assignedWowObject = nil
+		self:RegisterForClicks("LeftButtonUp", "RightButtonUp")
+		self.Id = self:GetID()
+		CyborgMMO_RatPageModel.Instance().AddObserver(self)
+		self.UnCheckedTexture = self:GetNormalTexture()
 
 		-- Object Method --
 		self.Clicked = function()
 			self:GetParent().SlotClicked(self)
 
-			GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-			--GameTooltip:SetText(self:GetID());
+			GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
+		--	GameTooltip:SetText(self:GetID())
 		end
 
 		self.Update = function(data, activeMode)
-			local icon = _G[self:GetName().."Icon"];
-			if(nil ~= data[activeMode][self.Id]) then
-				self:SetChecked(true);
-				icon:SetTexture(data[activeMode][self.Id].Texture);
+			local icon = _G[self:GetName().."Icon"]
+			if data[activeMode][self.Id] then
+				self:SetChecked(true)
+				icon:SetTexture(data[activeMode][self.Id].Texture)
 			else
-				icon:SetTexture(nil);
-				self:SetChecked(false);
+				icon:SetTexture(nil)
+				self:SetChecked(false)
 			end
 
 
 		end
 
-		return self;
+		return self
 	end,
 }
 
 CyborgMMO_SlotMiniView = {
 	new = function(self, parent)
-		self._assignedWowObject = nil;
-		self.Id = self:GetID();
-		CyborgMMO_RatPageModel.Instance().AddObserver(self);
-		self.UnCheckedTexture = self:GetNormalTexture();
+		self._assignedWowObject = nil
+		self.Id = self:GetID()
+		CyborgMMO_RatPageModel.Instance().AddObserver(self)
+		self.UnCheckedTexture = self:GetNormalTexture()
 
 		self.Update = function(data, activeMode)
-			local icon = _G[self:GetName().."Icon"];
-			if(nil ~= data[activeMode][self.Id]) then
-				self:SetChecked(true);
+			local icon = _G[self:GetName().."Icon"]
+			if data[activeMode][self.Id] then
+				self:SetChecked(true)
 
-				icon:SetTexture(data[activeMode][self.Id].Texture);
-				icon:SetAlpha(.5);
+				icon:SetTexture(data[activeMode][self.Id].Texture)
+				icon:SetAlpha(.5)
 			else
-				icon:SetTexture(nil);
-				self:SetChecked(false);
+				icon:SetTexture(nil)
+				self:SetChecked(false)
 			end
 		end
 
-		return self;
-	end
+		return self
+	end,
 }
 
 
 -- ModeButton --
 CyborgMMO_ModeView = {
 	new = function(self)
-	self.Id = self:GetID();
-	self.Name = self:GetName();
-	CyborgMMO_RatPageModel.Instance().AddObserver(self);
-	if(self.Id ~= 1) then
-		self:Hide()
-	end
+		self.Id = self:GetID()
+		self.Name = self:GetName()
+		CyborgMMO_RatPageModel.Instance().AddObserver(self)
+		if self.Id ~= 1 then
+			self:Hide()
+		end
 
 		self.Clicked = function()
-			local nextMode;
-			if(self.Id == 1) then
-				nextMode = getglobal("Mode2");
+			local nextMode
+			if self.Id == 1 then
+				nextMode = getglobal("Mode2")
+			elseif self.Id == 2 then
+				nextMode = getglobal("Mode3")
 			else
-				if(self.Id == 2) then
-					nextMode = getglobal("Mode3");
-				else
-					nextMode = getglobal("Mode1");
-				end
+				nextMode = getglobal("Mode1")
 			end
 			self:GetParent().ModeClicked(nextMode)
 		end
 
 		self.Update = function(data, activeMode)
-			if(self.Id == activeMode) then
+			if self.Id == activeMode then
 				self:Show()
 			else
 				self:Hide()
 			end
-
 		end
 
-	return self;
-	end
+		return self
+	end,
 }
diff -r 72b92b3e476e -r 6cb9a2936580 RatQuickPage.xml
--- a/RatQuickPage.xml	Tue Apr 16 15:19:23 2013 +0000
+++ b/RatQuickPage.xml	Thu Apr 25 01:29:45 2013 +0000
@@ -51,10 +51,10 @@
 	<Button name="CyborgMMO_TemplateSmallSlot" inherits="CyborgMMO_TemplateSmallIcon" virtual="true">
 		<Scripts>
 			<OnLoad>
-				self = CyborgMMO_SlotMiniView.new(self);
+				self = CyborgMMO_SlotMiniView.new(self)
 			</OnLoad>
 			<OnClick>
-				self.Clicked();
+				self.Clicked()
 			</OnClick>
 		</Scripts>
 	</Button>
@@ -223,7 +223,7 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				CyborgMMO_RatQuickPageView.new(self);
+				CyborgMMO_RatQuickPageView.new(self)
 			</OnLoad>
 		</Scripts>
 	</Frame>
diff -r 72b92b3e476e -r 6cb9a2936580 WowObjects.lua
--- a/WowObjects.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/WowObjects.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: WowObjects.lua
 --~ Description: Warcraft in game object models
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -20,37 +20,37 @@
 
 CyborgMMO_WowObject = {
 	new = function(type, detail, subdetail)
-		local self = {};
-		self.Texture = nil;
-		self.Name = "NoName";
-		self.Type = type;
-		self.Detail = detail;
-		self.Subdetail = subdetail;
-
+		local self = {}
+		self.Texture = nil
+		self.Name = "NoName"
+		self.Type = type
+		self.Detail = detail
+		self.Subdetail = subdetail
 
 		-- Methods --
 		self.DoAction = function()
-			msg("Nothing To Do");
+			msg("Nothing To Do")
 		end
 
 		self.Pickup = function()
-			msg("Pick up Item");
+			msg("Pick up Item")
 		end
 
 		self.SetBinding = function(key)
 		end
 
 		self.PlaySound = function()
-			PlaySound("igAbilityIconDrop");
+			PlaySound("igAbilityIconDrop")
 		end
 
-		return self;
+		return self
 	end,
 
 	ClearBinding = function(key)
-		local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(CyborgMMO_WowObject.DoNothing);
-		if(1 ~= SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")) then
-			msg("Failed to bind companion to button click");
+		local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(CyborgMMO_WowObject.DoNothing)
+		local result = SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")
+		if result ~= 1 then
+			msg("Failed to bind companion to button click")
 		end
 	end,
 
@@ -58,158 +58,155 @@
 	end,
 
 	Load = function(object)
-		if("item" == type) then
+		if type == "item" then
 			object = CyborgMMO_WowItem.Load(Object)
-		elseif("macro" == type) then
+		elseif type == "macro" then
 			object = CyborgMMO_WowMacro.Load(object)
-		elseif("spell" == type) then
+		elseif type == "spell" then
 			object = CyborgMMO_WowSpell.Load(object)
-		elseif("petaction" == type) then
+		elseif type == "petaction" then
 			object = CyborgMMO_WowSpell.Load(object)
-		--elseif("merchant"== type) then
-			--object = SlotMerchant.new(detail,subdetail)
-		elseif("companion" == type) then
+	--	elseif type == "merchant" then
+	--		object = SlotMerchant.new(detail, subdetail)
+		elseif type == "companion" then
 			object = CyborgMMO_WowCompanion.Load(object)
-		elseif("equipmentset" == type) then
+		elseif type == "equipmentset" then
 			object = CyborgMMO_WowEquipmentSet.Load(object)
 		else
-			object = CyborgMMO_WowObject.new(type,detail, subdetail)
+			object = CyborgMMO_WowObject.new(type, detail, subdetail)
 		end
-		return object;
+		return object
 	end,
 
 	-- Static Methods --
 	Create = function(objectType, detail, subdetail)
-		local object;
-		if("item" == objectType) then
-			object = CyborgMMO_WowItem.new(detail,subdetail)
-		elseif("macro" == objectType) then
+		local object
+		if objectType == "item" then
+			object = CyborgMMO_WowItem.new(detail, subdetail)
+		elseif objectType == "macro" then
 			object = CyborgMMO_WowMacro.new(detail)
-		elseif("spell" == objectType) then
-			object = CyborgMMO_WowSpell.new(objectType, detail,subdetail)
-		elseif("petaction" == objectType) then
-			object = CyborgMMO_WowSpell.new(objectType, detail,subdetail)
-		elseif("merchant"== objectType) then
-			object = CyborgMMO_SlotMerchant.new(detail,subdetail)
-		elseif("companion" == objectType) then
-			object = CyborgMMO_WowCompanion.new(detail,subdetail)
-		elseif("equipmentset" == objectType) then
-			object = CyborgMMO_WowEquipmentSet.new(objectType,detail,subdetail)
-		elseif("callback" == objectType) then
-			object = CyborgMMO_WowCallback.new(detail);
+		elseif objectType == "spell" then
+			object = CyborgMMO_WowSpell.new(objectType, detail, subdetail)
+		elseif objectType == "petaction" then
+			object = CyborgMMO_WowSpell.new(objectType, detail, subdetail)
+		elseif objectType == "merchant" then
+			object = CyborgMMO_SlotMerchant.new(detail, subdetail)
+		elseif objectType == "companion" then
+			object = CyborgMMO_WowCompanion.new(detail, subdetail)
+		elseif objectType == "equipmentset" then
+			object = CyborgMMO_WowEquipmentSet.new(objectType, detail, subdetail)
+		elseif objectType == "callback" then
+			object = CyborgMMO_WowCallback.new(detail)
 		else
-			object = CyborgMMO_WowObject.new(objectType,detail, subdetail)
+			object = CyborgMMO_WowObject.new(objectType, detail, subdetail)
 		end
 
-		return object;
-	end
+		return object
+	end,
 }
 
-local CallbackCursor = nil;
+local CallbackCursor = nil
 
 CyborgMMO_CallbackIcons = {
 	new = function(self)
-		self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs = self:GetPoint();
-		--self:SetPoint(self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs);
-		self.strata = self:GetFrameStrata();
+		self.point,
+		self.relativeTo,
+		self.relativePoint,
+		self.xOfs,
+		self.yOfs = self:GetPoint()
+	--	self:SetPoint(self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs)
+		self.strata = self:GetFrameStrata()
 		self.wowObject = CyborgMMO_WowCallback.new(string.gsub(self:GetName(), self:GetParent():GetName(), "",1))
-		self.wowObject.SetTextures(self);
+		self.wowObject.SetTextures(self)
 		self:RegisterForDrag("LeftButton","RightButton")
-		self:SetResizable(false);
-		
+		self:SetResizable(false)
+
 		self.OnClick = function()
-			self.wowObject.DoAction();
+			self.wowObject.DoAction()
 		end
-		
-		
+
 		self.DragStart = function()
-			self:SetMovable(true);
-			self:StartMoving();
-			self.isMoving = true;
+			self:SetMovable(true)
+			self:StartMoving()
+			self.isMoving = true
 			self:SetFrameStrata("TOOLTIP")
 		end
-		
+
 		self.DragStop = function()
-		
-			self:SetFrameStrata(self.strata);
-			self.isMoving = false;
-			self:SetMovable(false);
-			self:StopMovingOrSizing();
+			self:SetFrameStrata(self.strata)
+			self.isMoving = false
+			self:SetMovable(false)
+			self:StopMovingOrSizing()
 
-			self:ClearAllPoints();
-			self:SetPoint(self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs);
-			local x, y  = GetCursorPosition();
+			self:ClearAllPoints()
+			self:SetPoint(self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs)
+			local x,y = GetCursorPosition()
 			CyborgMMO_RatPageController.Instance().CallbackDropped(self)
 		end
-		
-		return self;
-	end
+
+		return self
+	end,
 }
 
 CyborgMMO_WowCallback = {
 	new = function(callbackName)
-		local self = CyborgMMO_WowObject.new("callback", callbackName, "");
-		self.CallbackName = callbackName;
+		local self = CyborgMMO_WowObject.new("callback", callbackName, "")
+		self.CallbackName = callbackName
 		self.Texture = "Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Unselected.tga"
-		
+
 		self.SetTextures = function(buttonFrame)
 			msg("TextureName = "..self.CallbackName)
 			buttonFrame:SetNormalTexture("Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Unselected.tga")
 			buttonFrame:SetPushedTexture("Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Down.tga")
 			buttonFrame:SetHighlightTexture("Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Over.tga")
 		end
-		
+
 		self.DoAction = function()
 			local action = CyborgMMO_CallbackFactory.Instance().GetCallback(self.CallbackName)
-			msg("calling callback:- "..self.CallbackName);
-			action();
-			
+			msg("calling callback:- "..self.CallbackName)
+			action()
 		end
-		
+
 		self.PickupCallback = function()
-			
-			local slot = nil;
-			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers();
-			for i = 1, (# observers) do
-				if(MouseIsOver(observers[i])) then
-					slot = observers[i];
-					break;
+			local slot = nil
+			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers()
+			for i=1,#observers do
+				if MouseIsOver(observers[i]) then
+					slot = observers[i]
+					break
 				end
 			end
 			slot:SetNormalTexture(slot.UnCheckedTexture)
 		end
 
-		
 		self.ClickHandler = function(self, button, down)
-			msg("click handler");
-			CallbackCursor:StopMoving();
-			CallbackCursor:Hide();
+			msg("click handler")
+			CallbackCursor:StopMoving()
+			CallbackCursor:Hide()
 		end
-		
+
 		self.Pickup = function()
 			self.PlaySound()
-			ClearCursor();
-			self.PickupCallback();
+			ClearCursor()
+			self.PickupCallback()
+		end
 
-		end
-		
-		
 		self.SetBinding = function(key)
-			local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
-			if(1 ~= SetOverrideBindingClick(CyborgMMO_CallbackFactory.Instance().Frame, true, key, name, "LeftButton")) then
-				msg("Failed to Bind modeChange");
+			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction)
+			local result = SetOverrideBindingClick(CyborgMMO_CallbackFactory.Instance().Frame, true, key, name, "LeftButton")
+			if result ~= 1 then
+				msg("Failed to Bind modeChange")
 			end
 		end
-		
-		return self;
-	end
+
+		return self
+	end,
 }
 
 -- WowItem Class --
-
 CyborgMMO_WowItem = {
 	new = function(number, itemID)
-		local self = CyborgMMO_WowObject.new("item", number, itemID); -- base class
+		local self = CyborgMMO_WowObject.new("item", number, itemID) -- base class
 		-- Set all the item info. --
 		self.Name,
 		self.Link,
@@ -221,153 +218,153 @@
 		self.StackCount,
 		self.EquipLoc,
 		self.Texture,
-		self.SellPrice = GetItemInfo(itemID);
+		self.SellPrice = GetItemInfo(itemID)
 
 		-- override method --
 		self.DoAction = function()
-			msg("Use Item");
+			msg("Use Item")
 		end
 
 		-- override method --
 		self.Pickup = function()
 			self.PlaySound()
-			ClearCursor();
-			--SetCursor(self.Texture);
-			return PickupItem(self.Link);
+			ClearCursor()
+		--	SetCursor(self.Texture)
+			return PickupItem(self.Link)
 		end
 
 		self.SetBinding = function(key)
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "ITEM "..self.Name);
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "ITEM "..self.Name)
 		end
 
-		return self;
+		return self
 	end,
 }
 
 -- WowSpell Class --
-
 CyborgMMO_WowSpell = {
 	new = function(type, spellbookID, spellbook)
 		local self = CyborgMMO_WowObject.new(type, spellbookID, spellbook) -- base class
-		self.SpellbookID = spellbookID;
-		self.Spellbook = spellbook;
-		self.Name, self.Rank = GetSpellBookItemName(spellbookID, spellbook);
-		self.Texture = GetSpellBookItemTexture(spellbookID, spellbook);
-		self.Type = type;
+		self.SpellbookID = spellbookID
+		self.Spellbook = spellbook
+		self.Name,self.Rank = GetSpellBookItemName(spellbookID, spellbook)
+		self.Texture = GetSpellBookItemTexture(spellbookID, spellbook)
+		self.Type = type
 
 
 		-- override method --
 		self.DoAction = function()
-			msg("Cast Spell");
+			msg("Cast Spell")
 		end
 
 		-- override method --
 		self.Pickup = function()
 			self.PlaySound()
-			ClearCursor();
-			--SetCursor(self.Texture);
-			return PickupSpellBookItem(self.SpellbookID, self.Spellbook);
+			ClearCursor()
+		--	SetCursor(self.Texture)
+			return PickupSpellBookItem(self.SpellbookID, self.Spellbook)
 		end
 
 		self.SetBinding = function(key)
 			msg("Binding to key "..key)
 			self.Key = key
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, self.Key, self.Type.." "..self.Name);
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, self.Key, self.Type.." "..self.Name)
 		end
 
-    return self;
-
+		return self
 	end,
 
 	Load = function(object)
-		local o = WowSpell.new(object.Type, object.Detail, object.Subdetail);
-		o.Name = object.Name;
-		o.Texture = object.Texture;
-		return o;
-	end
+		local o = WowSpell.new(object.Type, object.Detail, object.Subdetail)
+		o.Name = object.Name
+		o.Texture = object.Texture
+		return o
+	end,
 }
 
 -- WowMacro Class --
-
 CyborgMMO_WowMacro = {
 	new = function(index)
-		local self = CyborgMMO_WowObject.new("macro", index, nil); -- base class
+		local self = CyborgMMO_WowObject.new("macro", index, nil) -- base class
 		-- Set all the item info. --
 		self.Name,
 		self.Texture,
 		self.Body,
-		self.isLocal = GetMacroInfo(index);
-		self.Index = index;
+		self.isLocal = GetMacroInfo(index)
+		self.Index = index
 
 		-- override method --
 		self.DoAction = function()
-			msg("Use Item");
+			msg("Use Item")
 		end
 
 		-- override method --
 		self.Pickup = function()
 			self.PlaySound()
-			ClearCursor();
-			--SetCursor(self.Texture);
-			return PickupMacro(self.Index);
+			ClearCursor()
+		--	SetCursor(self.Texture)
+			return PickupMacro(self.Index)
 		end
 
 		self.SetBinding = function(key)
-			self.Key = key;
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MACRO "..self.Index);
+			self.Key = key
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MACRO "..self.Index)
 		end
 
-    return self;
-  end,
+		return self
+	end,
 }
 
-
 -- WowCompanion Class --
-
 CyborgMMO_WowCompanion = {
 	new = function(index, SubType)
-		local self = CyborgMMO_WowObject.new("companion", index, SubType); -- base class
+		local self = CyborgMMO_WowObject.new("companion", index, SubType) -- base class
 		-- Set all the item info. --
-		self.Id, self.Name, self.SpellId, self.Texture,	self.isSummoned = GetCompanionInfo(SubType, index);
-		self.SubType = SubType;
-		self.index = index;
+		self.Id,
+		self.Name,
+		self.SpellId,
+		self.Texture,
+		self.isSummoned = GetCompanionInfo(SubType, index)
+		self.SubType = SubType
+		self.index = index
 		-- override method --
 		self.DoAction = function()
-			if((self.SubType == "MOUNT") and IsMounted()) then
-				Dismount();
+			if self.SubType == "MOUNT" and IsMounted() then
+				Dismount()
 			else
-				CallCompanion(self.SubType, self.index);
+				CallCompanion(self.SubType, self.index)
 			end
 		end
 
 		-- override method --
 		self.Pickup = function()
 			self.PlaySound()
-			return PickupCompanion(self.SubType, self.index);
+			return PickupCompanion(self.SubType, self.index)
 		end
 
 		self.SetBinding = function(key)
 			self.Key = key
-			local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
-			if(1 ~= SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")) then
-				msg("Failed to bind companion to button click");
+			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction)
+			local result = SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")
+			if result ~= 1 then
+				msg("Failed to bind companion to button click")
 			end
-			--SetOverrideBinding(hiddenModeChanger, true, key, "MACRO "..self.Index);
+		--	SetOverrideBinding(hiddenModeChanger, true, key, "MACRO "..self.Index)
 		end
 
-		return self;
+		return self
 	end,
 
 	Load = function(object)
-		local o = WowCompanion.new(object.index, object.SubType);
-		return o;
-	end
+		local o = WowCompanion.new(object.index, object.SubType)
+		return o
+	end,
 }
 
 -- WowMerchant Class --
 CyborgMMO_WowMerchant = {
 	new = function(index)
-		local self = CyborgMMO_WowObject.new("macro", index, nil); -- base class
+		local self = CyborgMMO_WowObject.new("macro", index, nil) -- base class
 		-- Set all the item info. --
 		self.Name,
 		self.Texture,
@@ -375,65 +372,65 @@
 		self.Quantity,
 		self.NumAvailable,
 		self.IsUsable,
-		self.ExtendedCost = GetMerchantItemInfo(index);
-		self.Index = index;
+		self.ExtendedCost = GetMerchantItemInfo(index)
+		self.Index = index
 
 		-- override method --
 		self.DoAction = function()
-			msg("Use Item");
+			msg("Use Item")
 		end
 
 		-- override method --
 		self.Pickup = function()
 			self.PlaySound()
-			ClearCursor();
-			--SetCursor(self.Texture);
-			return PickupMerchantItem(self.Index);
+			ClearCursor()
+		--	SetCursor(self.Texture)
+			return PickupMerchantItem(self.Index)
 		end
 
 		self.SetBinding = function(key)
 			self.Key = key
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MERCHANT "..self.Index);
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MERCHANT "..self.Index)
 		end
 
-    return self;
-  end,
+		return self
+	end,
 }
 
 -- WowEquipmentSet Class --
 CyborgMMO_WowEquipmentSet = {
 	new = function(objectType, name, index)
-		local self = CyborgMMO_WowObject.new(objectType, name, index); -- base class
+		local self = CyborgMMO_WowObject.new(objectType, name, index) -- base class
 		-- Set all the item info. --
-		texture, lessIndex = GetEquipmentSetInfoByName(name);
-		self.Texture = "Interface\\Icons\\"..texture;
+		texture,lessIndex = GetEquipmentSetInfoByName(name)
+		self.Texture = "Interface\\Icons\\"..texture
 		self.Name = name
-		self.Index = lessIndex+1;
+		self.Index = lessIndex + 1
 
 		-- override method --
 		self.DoAction = function()
-			UseEquipmentSet(self.Name);
+			UseEquipmentSet(self.Name)
 		end
 
 		-- override method --
 		self.Pickup = function()
 			self.PlaySound()
-			ClearCursor();
-			--SetCursor(self.Texture);
-			return PickupEquipmentSetByName(self.Name);
+			ClearCursor()
+		--	SetCursor(self.Texture)
+			return PickupEquipmentSetByName(self.Name)
 		end
 
 		self.SetBinding = function(key)
 			self.Key = key
-			local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
-			if(1 ~= SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")) then
-				msg("Failed to bind companion to button click");
+			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
+			local result = SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")
+			if result ~= 1 then
+				msg("Failed to bind companion to button click")
 			end
 		end
 
-    return self;
-  end,
+		return self
+	end,
 }
 
-
 -- End Of WowObjects --