diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index aebae7c..1b0b2ef 100644
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -32,19 +32,19 @@
         </hbox>
       </vbox>
       <vbox>
-       <hbox>
-        <checkbox id="checkbool_chde" preference="bool_chde" label="&checkboolchde.label;"/>
+        <hbox>
+          <checkbox id="checkbool_chde" preference="bool_chde" label="&checkboolchde.label;"/>
+        </hbox>
+        <hbox>
+          <checkbox id="checkbool_itde" preference="bool_itde" label="&checkboolitde.label;"/>
+        </hbox>
+        <hbox>
+          <checkbox id="checkbool_rude" preference="bool_rude" label="&checkboolrude.label;"/>
+        </hbox>
+        <hbox>
+          <checkbox id="checkbool_ptde" preference="bool_ptde" label="&checkboolptde.label;"/>
        </hbox>
-       <hbox>
-         <checkbox id="checkbool_itde" preference="bool_itde" label="&checkboolitde.label;"/>
-       </hbox>
-       <hbox>
-         <checkbox id="checkbool_rude" preference="bool_rude" label="&checkboolrude.label;"/>
-       </hbox>
-       <hbox>
-         <checkbox id="checkbool_ptde" preference="bool_ptde" label="&checkboolptde.label;"/>
-       </hbox>
-    </vbox>
+      </vbox>
     </groupbox>
   </prefpane>
 </prefwindow>
diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index 76df176..e0409cb 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -86,38 +86,27 @@ var leo_search = {
 			index < tabbrowser.tabContainer.childNodes.length && !found;
 			index++) {
 
-			// Get the next tab
 			var currentTab = tabbrowser.tabContainer.childNodes[index];
 
-			// Does this tab contain our custom attribute?
 			if (currentTab.hasAttribute(attrName)) {
-				// Yes
 				found = true;
 				gBrowser.getBrowserAtIndex(index).loadURI(url);
 
 				if (foregroundTab) {
-					// select and focus it.
 					tabbrowser.selectedTab = currentTab;
-
-					// Focus *this* browser window in case another one is currently focused
 					tabbrowser.ownerDocument.defaultView.focus();
 				}
 			}
 		}
 		if (!found) {
-			// Our tab isn't open. Open it now.
 			var browserEnumerator = wm.getEnumerator("navigator:browser");
 			var tabbrowser = browserEnumerator.getNext().gBrowser;
 
-			// Create tab
 			var newTab = tabbrowser.addTab(url);
 			newTab.setAttribute(attrName, "leoOrg");
 
 			if (foregroundTab) {
-				// Focus tab
 				tabbrowser.selectedTab = newTab;
-
-				// Focus *this* browser window in case another one is currently focused
 				tabbrowser.ownerDocument.defaultView.focus();
 			}
 		}