diff --git a/src/widgets/EditPane.cpp b/src/widgets/EditPane.cpp
index dde2b58..10ad99c 100644
--- a/src/widgets/EditPane.cpp
+++ b/src/widgets/EditPane.cpp
@@ -385,9 +385,6 @@ void EditPane::_ApplyTheme(JsonValue &lexer_map)
 	for (int i = 0; i < max; i++)
 	{
 		string key = lexer_map[i].asString();
-		
-		//wxLogDebug("Token type: %s", key);
-		//wxLogDebug("Lexer constant: %i", i);
 
 		// Set the foreground color, if it exists
 		if ( ! theme_config->GetThemeValue("foreground", key).isNull())
diff --git a/src/widgets/MainFrame.cpp b/src/widgets/MainFrame.cpp
index 005eb3a..1429905 100644
--- a/src/widgets/MainFrame.cpp
+++ b/src/widgets/MainFrame.cpp
@@ -7,6 +7,9 @@
 extern TyroMenu *Glob_menu_bar;
 static TabContainer *notebook;
 
+// Frame icon
+#include "../../resources/xpm/tyro.xpm"
+
 /**
  * Constructor
  */
@@ -19,7 +22,7 @@ MainFrame::MainFrame(wxFrame *frame, const wxString &title)
 	notebook = new TabContainer(this);
 	
 	// Set the frame icon
-#include "../../resources/xpm/tyro.xpm"
+
 	wxIcon app_icon(tyro_icon);
 	this->SetIcon(app_icon);
 	
diff --git a/src/widgets/TyroMenu.cpp b/src/widgets/TyroMenu.cpp
index a888971..5e7b75f 100644
--- a/src/widgets/TyroMenu.cpp
+++ b/src/widgets/TyroMenu.cpp
@@ -3,6 +3,9 @@
 
 static LangConfig *lang_config;
 
+/**
+ * Constructor
+ */ 
 TyroMenu::TyroMenu()
 {
 	fileMenu = new wxMenu();
@@ -24,12 +27,20 @@ TyroMenu::TyroMenu()
 	this->Insert(myHELP_MENU, helpMenu, "&Help");
 }
 
+/**
+ * Destructor
+ */ 
 TyroMenu::~TyroMenu()
 {
 	wxLogDebug("TyroMenu Destructor Called.");
 	delete lang_config;
 }
 
+/**
+ * Setup basic menu items
+ * 
+ * @return void
+ */ 
 void TyroMenu::SetupMainMenus()
 {
 	// Add items to top-level menus
@@ -65,6 +76,11 @@ void TyroMenu::SetupMainMenus()
 	helpMenu->Append(wxID_ABOUT, "&About...\tF1", "Show info about this application");
 }
 
+/**
+ * Create the language selection menu
+ *
+ * @return void
+ */ 
 void TyroMenu::SetupLangMenu()
 {
 	StringMap langs = lang_config->GetLangList();
@@ -78,6 +94,12 @@ void TyroMenu::SetupLangMenu()
 	}
 }
 
+/**
+ * Enable/disable controls that require a file to be open
+ *
+ * @param bool enable 
+ * @return void
+ */ 
 void TyroMenu::EnableEditControls(bool enable)
 {
 	this->fileMenu->Enable(wxID_SAVE, enable);