diff --git a/content/events.js b/content/events.js
index b241db6b..d90f9548 100644
--- a/content/events.js
+++ b/content/events.js
@@ -603,7 +603,7 @@ liberator.Events = function () //{{{
                                 return;
 
                         let name = file.leafName.replace(/\.vimp$/i, "");
-                        macros.set(name, liberator.io.readFile(file).split(/\n/)[0]);
+                        macros.set(name, liberator.io.readFile(file).split("\n")[0]);
 
                         liberator.log("Macro " + name + " added: " + macros.get(name), 5);
                     });
@@ -720,7 +720,7 @@ liberator.Events = function () //{{{
             // removeEventListeners() to avoid mem leaks
             liberator.dump("TODO: remove all eventlisteners\n");
 
-            if (typeof(getBrowser) != "undefined")
+            if (typeof getBrowser != "undefined")
                 getBrowser().removeProgressListener(this.progressListener);
 
             window.removeEventListener("popupshown", enterPopupMode, true);
diff --git a/content/io.js b/content/io.js
index f2ee9fe5..60ab932a 100644
--- a/content/io.js
+++ b/content/io.js
@@ -93,23 +93,17 @@ liberator.IO = function () //{{{
     liberator.options.add(["cdpath", "cd"],
         "List of directories searched when executing :cd",
         "stringlist", cdpath,
-        {
-            setter: function (value) expandPathList(value)
-        });
+        { setter: function (value) expandPathList(value) });
 
     liberator.options.add(["runtimepath", "rtp"],
         "List of directories searched for runtime files",
         "stringlist", runtimepath,
-        {
-            setter: function (value) expandPathList(value)
-        });
+        { setter: function (value) expandPathList(value) });
 
     liberator.options.add(["shell", "sh"],
         "Shell to use for executing :! and :run commands",
         "string", shell,
-        {
-            setter: function (value) liberator.io.expandPath(value)
-        });
+        { setter: function (value) liberator.io.expandPath(value) });
 
     liberator.options.add(["shellcmdflag", "shcf"],
         "Flag passed to shell when executing :! and :run commands",
diff --git a/content/mail.js b/content/mail.js
index d02bd8d0..cb96fb43 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -344,7 +344,10 @@ liberator.Mail = function () //{{{
             var to = escapeRecipient(gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor);
             liberator.commandline.open(":", "message " + to + " -subject=", liberator.modes.EX);
           }
-          catch (e) { liberator.beep(); }
+          catch (e)
+          {
+              liberator.beep();
+          }
         });
 
     liberator.mappings.add(modes, ["r"],
@@ -650,7 +653,10 @@ liberator.Mail = function () //{{{
                     messenger.launchExternalURL(getRSSUrl());
                 // TODO: what to do for non-rss message?
             }
-            catch (e) { liberator.beep(); }
+            catch (e)
+            {
+                liberator.beep();
+            }
         });
 
     /////////////////////////////////////////////////////////////////////////////}}}
@@ -1031,7 +1037,7 @@ liberator.Mail = function () //{{{
                           [false, 0, 0],                          // HTML
                           [false, 3, gDisallow_classes_no_html]]; // sanitized/simple HTML
 
-            if (typeof(value) != "number" || value < 0 || value > 2)
+            if (typeof value != "number" || value < 0 || value > 2)
                 value = 1;
 
             gPrefBranch.setBoolPref("mailnews.display.prefer_plaintext", values[value][0]);
diff --git a/content/muttator.js b/content/muttator.js
index 1fc53360..095a9ca0 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -182,7 +182,7 @@ liberator.config = { //{{{
             // XXX: Hack!
             window.document.addEventListener("load", function ()
             {
-                if (typeof(window.messageWasEditedExternally) == "undefined")
+                if (typeof window.messageWasEditedExternally == "undefined")
                 {
                     window.messageWasEditedExternally = false;
                     GetCurrentEditor().addDocumentStateListener(stateListener);
diff --git a/content/ui.js b/content/ui.js
index 9a3392d1..e7292667 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -768,7 +768,7 @@ liberator.CommandLine = function () //{{{
                     historyIndex = UNINITIALIZED;
 
                     // TODO: call just once, and not on each <Tab>
-                    var wim = liberator.options["wildmode"].split(/,/);
+                    var wim = liberator.options["wildmode"].split(",");
                     var hasList = false;
                     var longest = false;
                     var full = false;
@@ -1333,7 +1333,7 @@ liberator.ItemList = function (id) //{{{
             doc = iframe.contentDocument;
             listOffset = listIndex = -1;
             completions = items || [];
-            if (typeof(selectedItem) == "number")
+            if (typeof selectedItem == "number")
             {
                 this.selectItem(selectedItem);
                 this.show();