diff --git a/bin/templates/cordova/Api.js b/bin/templates/cordova/Api.js
index 7a160433..8885809f 100644
--- a/bin/templates/cordova/Api.js
+++ b/bin/templates/cordova/Api.js
@@ -18,7 +18,6 @@
 */
 
 var path = require('path');
-var fs = require('fs');
 
 var AndroidProject = require('./lib/AndroidProject');
 var AndroidStudio = require('./lib/AndroidStudio');
@@ -222,7 +221,7 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
             require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles();
         }.bind(this))
         // CB-11022 Return truthy value to prevent running prepare after
-        .thenResolve(true)
+        .thenResolve(true);
 };
 
 /**
diff --git a/bin/templates/cordova/lib/AndroidStudio.js b/bin/templates/cordova/lib/AndroidStudio.js
index b26127bb..d0214afb 100644
--- a/bin/templates/cordova/lib/AndroidStudio.js
+++ b/bin/templates/cordova/lib/AndroidStudio.js
@@ -4,12 +4,15 @@
  *  @param {String} root Root folder of the project
  */
 
+/*jshint esversion: 6 */
+
 var path = require('path');
 var fs = require('fs');
 
 function isAndroidStudioProject(root) {
     var eclipseFiles = ['AndroidManifest.xml', 'libs', 'res', 'project.properties', 'platform_www'];
     var androidStudioFiles = ['app', 'gradle', 'build', 'app/src/main/assets'];
+    var file;
     for(file of eclipseFiles) {
       if(fs.existsSync(path.join(root, file))) {
         return false;
diff --git a/bin/templates/cordova/lib/pluginHandlers.js b/bin/templates/cordova/lib/pluginHandlers.js
index 79a443a2..d209de1b 100644
--- a/bin/templates/cordova/lib/pluginHandlers.js
+++ b/bin/templates/cordova/lib/pluginHandlers.js
@@ -34,7 +34,7 @@ var handlers = {
             var dest = path.join(obj.targetDir, path.basename(obj.src));
 
             if(options && options.android_studio === true) {
-              dest = path.join("app/src/main/java", obj.targetDir.substring(4), path.basename(obj.src));
+              dest = path.join('app/src/main/java', obj.targetDir.substring(4), path.basename(obj.src));
             }
 
             if (options && options.force) {
@@ -47,7 +47,7 @@ var handlers = {
             var dest = path.join(obj.targetDir, path.basename(obj.src));
             
             if(options && options.android_studio === true) {
-              dest = path.join("app/src/main/java", obj.targetDir.substring(4), path.basename(obj.src));
+              dest = path.join('app/src/main/java', obj.targetDir.substring(4), path.basename(obj.src));
             }
 
             deleteJava(project.projectDir, dest);
@@ -57,14 +57,14 @@ var handlers = {
         install:function(obj, plugin, project, options) {
             var dest = path.join('libs', path.basename(obj.src));
             if(options && options.android_studio === true) {
-              dest = path.join("app/libs", path.basename(obj.src));
+              dest = path.join('app/libs', path.basename(obj.src));
             }
             copyFile(plugin.dir, obj.src, project.projectDir, dest, !!(options && options.link));
         },
         uninstall:function(obj, plugin, project, options) {
             var dest = path.join('libs', path.basename(obj.src));
             if(options && options.android_studio === true) {
-              dest = path.join("app/libs", path.basename(obj.src));
+              dest = path.join('app/libs', path.basename(obj.src));
             }
             removeFile(project.projectDir, dest);
         }