diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js
index 5c5f0f368..a2e93a30e 100644
--- a/src/drivers/bookmarklet/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -9,7 +9,7 @@
 
 	var
 		w             = wappalyzer,
-		debug         = true
+		debug         = true,
 		d             = window.document,
 		container     = d.getElementById('wappalyzer-container'),
 		domain        = window.top.location.host,
diff --git a/src/drivers/chrome/js/i18n.js b/src/drivers/chrome/js/i18n.js
index f8207e6e1..2f11efbc5 100644
--- a/src/drivers/chrome/js/i18n.js
+++ b/src/drivers/chrome/js/i18n.js
@@ -1,9 +1,8 @@
 document.addEventListener('DOMContentLoaded', function() {
 	var
 		i, value,
-		d     = document
-		nodes = d.getElementsByTagName('*')
-		;
+		d     = document,
+		nodes = d.getElementsByTagName('*');
 
 	for ( i = 0; i < nodes.length; i ++ ) {
 		if ( attr = nodes[i].dataset.i18n ) {
diff --git a/src/drivers/chrome/js/inject.js b/src/drivers/chrome/js/inject.js
index fd734182e..2a8856596 100644
--- a/src/drivers/chrome/js/inject.js
+++ b/src/drivers/chrome/js/inject.js
@@ -1,6 +1,7 @@
 (function() {
 	try {
-		var i, environmentVars, e = document.createEvent('Events');
+		var i, environmentVars,
+        e = document.createEvent('Events');
 
 		e.initEvent('wappalyzerEvent', true, false);
 
diff --git a/src/drivers/chrome/js/popup.js b/src/drivers/chrome/js/popup.js
index a2657b67b..e3afa610a 100644
--- a/src/drivers/chrome/js/popup.js
+++ b/src/drivers/chrome/js/popup.js
@@ -37,7 +37,7 @@ document.addEventListener('DOMContentLoaded', function() {
 							confidence = response.tabCache.appsDetected[appName].confidenceTotal;
 							version    = response.tabCache.appsDetected[appName].version;
 
-							html =
+							var html =
 								'<div class="detected-app">' +
 									'<a target="_blank" href="https://wappalyzer.com/applications/' + slugify(appName) + '?pk_campaign=chrome&pk_kwd=popup">' +
 										'<img src="images/icons/' + response.apps[appName].icon + '"/>' +
diff --git a/src/drivers/firefox/data/js/panel.js b/src/drivers/firefox/data/js/panel.js
index 60f97d102..8fbfc9d3d 100644
--- a/src/drivers/firefox/data/js/panel.js
+++ b/src/drivers/firefox/data/js/panel.js
@@ -1,7 +1,7 @@
 (function() {
 	self.port.on('displayApps', function(message) {
 		var
-			div, a, img, label, name, slugify,
+			div, a, img, label, name, slugify, confidence, version,
 			d = document,
 			detectedApps = d.getElementById('detected-apps'),
 			empty = d.getElementById('empty');
@@ -52,8 +52,8 @@
 				label.appendChild(name);
 				label.appendChild(d.createTextNode(( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '')));
 
-				a.appendChild(img)
-				a.appendChild(label)
+				a.appendChild(img);
+				a.appendChild(label);
 
 				div.appendChild(a);
 
diff --git a/src/drivers/firefox/data/js/tab.js b/src/drivers/firefox/data/js/tab.js
index c4bd3c65b..eafd3c507 100644
--- a/src/drivers/firefox/data/js/tab.js
+++ b/src/drivers/firefox/data/js/tab.js
@@ -4,8 +4,8 @@
 	try {
 		if ( document && document.contentType === 'text/html' ) {
 			var
-				html = new XMLSerializer().serializeToString(document)
-				env = [];
+				html = new XMLSerializer().serializeToString(document),
+				env = []; // TODO: Remove, `env` not used in this scope?
 
 			self.port.emit('log', html);
 
diff --git a/src/drivers/phantomjs/driver.js b/src/drivers/phantomjs/driver.js
index 922e3cb05..3c409d279 100644
--- a/src/drivers/phantomjs/driver.js
+++ b/src/drivers/phantomjs/driver.js
@@ -5,8 +5,8 @@
 		scriptDir,
 		scriptPath      = require('fs').absolute(require('system').args[0]),
 		resourceTimeout = 9000,
-		args            = [],
-		debug           = false; // Output debug messages
+		args            = [],    // TODO: Not used, maybe should be `arg`
+		debug           = false, // Output debug messages
 		quiet           = false; // Don't output errors
 
 	try {