diff --git a/extensions/firefox/.eslintrc b/extensions/firefox/.eslintrc
index 9ab662ea3..89561cf5f 100644
--- a/extensions/firefox/.eslintrc
+++ b/extensions/firefox/.eslintrc
@@ -8,6 +8,9 @@
   },
 
   "rules": {
+    // Best Practices
+    "consistent-return": "error",
+
     // Variables
     "no-shadow": "error",
     "no-unused-vars": ["error", {
@@ -17,6 +20,7 @@
     }],
 
     // Stylistic Issues
+    "no-nested-ternary": "error",
     "quotes": ["error", "double"],
     "space-before-function-paren": ["error", "never"],
 
diff --git a/extensions/firefox/content/PdfStreamConverter.jsm b/extensions/firefox/content/PdfStreamConverter.jsm
index bcba3bb2d..428961c35 100644
--- a/extensions/firefox/content/PdfStreamConverter.jsm
+++ b/extensions/firefox/content/PdfStreamConverter.jsm
@@ -538,11 +538,11 @@ class ChromeActions {
           break;
       }
     }
+    let result = JSON.stringify(currentPrefs);
     if (sendResponse) {
-      sendResponse(JSON.stringify(currentPrefs));
-    } else {
-      return JSON.stringify(currentPrefs);
+      sendResponse(result);
     }
+    return result;
   }
 }
 
diff --git a/extensions/firefox/content/PdfjsChromeUtils.jsm b/extensions/firefox/content/PdfjsChromeUtils.jsm
index 25e872470..1d6c3f8af 100644
--- a/extensions/firefox/content/PdfjsChromeUtils.jsm
+++ b/extensions/firefox/content/PdfjsChromeUtils.jsm
@@ -152,7 +152,6 @@ var PdfjsChromeUtils = {
         this._displayWarning(aMsg);
         break;
 
-
       case "PDFJS:Parent:updateControlState":
         return this._updateControlState(aMsg);
       case "PDFJS:Parent:addEventListener":
@@ -160,6 +159,7 @@ var PdfjsChromeUtils = {
       case "PDFJS:Parent:removeEventListener":
         return this._removeEventListener(aMsg);
     }
+    return undefined;
   },
 
   /*