diff --git a/public/app/core/settings.js b/public/app/core/settings.js
index 2fa484a9cba..59eaf8ea8b9 100644
--- a/public/app/core/settings.js
+++ b/public/app/core/settings.js
@@ -22,7 +22,6 @@ function (_) {
       appSubUrl: ""
     };
 
-    var settings = _.extend({}, defaults, options);
-    return settings;
+    return _.extend({}, defaults, options);
   };
 });
diff --git a/public/app/core/store.js b/public/app/core/store.js
index 84e72b96314..504b0e5aff5 100644
--- a/public/app/core/store.js
+++ b/public/app/core/store.js
@@ -12,7 +12,7 @@ define([], function() {
       if (def !== void 0 && !this.exists(key)) {
         return def;
       }
-      return window.localStorage[key] === 'true' ? true : false;
+      return window.localStorage[key] === 'true';
     },
     exists: function(key) {
       return window.localStorage[key] !== void 0;
diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js
index ce7cbeb11d2..698abcc51fd 100644
--- a/public/app/features/dashboard/dashboardSrv.js
+++ b/public/app/features/dashboard/dashboardSrv.js
@@ -26,7 +26,7 @@ function (angular, $, _, moment) {
       this.tags = data.tags || [];
       this.style = data.style || "dark";
       this.timezone = data.timezone || 'browser';
-      this.editable = data.editable === false ? false : true;
+      this.editable = data.editable !== false;
       this.hideControls = data.hideControls || false;
       this.sharedCrosshair = data.sharedCrosshair || false;
       this.rows = data.rows || [];
@@ -48,10 +48,10 @@ function (angular, $, _, moment) {
     p._initMeta = function(meta) {
       meta = meta || {};
 
-      meta.canShare = meta.canShare === false ? false : true;
-      meta.canSave = meta.canSave === false ? false : true;
-      meta.canStar = meta.canStar === false ? false : true;
-      meta.canEdit = meta.canEdit === false ? false : true;
+      meta.canShare = meta.canShare !== false;
+      meta.canSave = meta.canSave !== false;
+      meta.canStar = meta.canStar !== false;
+      meta.canEdit = meta.canEdit !== false;
 
       if (!this.editable) {
         meta.canEdit = false;
@@ -151,7 +151,6 @@ function (angular, $, _, moment) {
             result.panel = panel;
             result.row = row;
             result.index = index;
-            return;
           }
         });
       });
diff --git a/public/app/features/dashboard/partials/graphiteImport.html b/public/app/features/dashboard/partials/graphiteImport.html
index 343b5d52e41..9c351346fe6 100644
--- a/public/app/features/dashboard/partials/graphiteImport.html
+++ b/public/app/features/dashboard/partials/graphiteImport.html
@@ -25,7 +25,7 @@
 				<td>
 					<button class="btn btn-inverse pull-right" ng-click="import(dash.name)">
 						Load
-					</a>
+					</button>
 				</td>
 			</tr>
 		</table>
diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js
index 758c06b1975..bbb38d745c7 100644
--- a/public/app/features/dashboard/unsavedChangesSrv.js
+++ b/public/app/features/dashboard/unsavedChangesSrv.js
@@ -122,11 +122,7 @@ function(angular, _) {
       var currentJson = angular.toJson(current);
       var originalJson = angular.toJson(original);
 
-      if (currentJson !== originalJson) {
-        return true;
-      }
-
-      return false;
+      return currentJson !== originalJson;
     };
 
     p.open_modal = function() {
diff --git a/public/app/features/dashlinks/module.js b/public/app/features/dashlinks/module.js
index 6b5677e5d2d..b7029e6cf2d 100644
--- a/public/app/features/dashlinks/module.js
+++ b/public/app/features/dashlinks/module.js
@@ -52,7 +52,7 @@ function (angular, _) {
         if (link.asDropdown) {
           template += '<ul class="dropdown-menu" role="menu">' +
             '<li ng-repeat="dash in link.searchHits"><a href="{{dash.url}}"><i class="fa fa-th-large"></i> {{dash.title}}</a></li>' +
-            '</ul';
+            '</ul>';
         }
 
         elem.html(template);
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 355131c2dbb..b54f8875f87 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -45,7 +45,7 @@
 					{{invite.email}}
 					<span ng-show="invite.name" style="padding-left: 20px"> {{invite.name}}</span>
 					<span class="pull-right">
-						<button class="btn btn-inverse btn-mini " data-clipboard-text="{{invite.url}}" clipboard-button ng-click="copyInviteToClipboard($event)"
+						<button class="btn btn-inverse btn-mini " data-clipboard-text="{{invite.url}}" clipboard-button ng-click="copyInviteToClipboard($event)">
 							<i class="fa fa-clipboard"></i> Copy Invite
 						</button>
 						&nbsp;
diff --git a/public/app/features/panel/panel_menu.js b/public/app/features/panel/panel_menu.js
index 3a1cda0acbe..30b61418d72 100644
--- a/public/app/features/panel/panel_menu.js
+++ b/public/app/features/panel/panel_menu.js
@@ -64,8 +64,7 @@ function (angular, $, _) {
       }
 
       function getExtendedMenu($scope) {
-        var menu = angular.copy($scope.panelMeta.extendedMenu);
-        return menu;
+        return angular.copy($scope.panelMeta.extendedMenu);
       }
 
       return {
diff --git a/public/app/panels/text/lib/showdown.js b/public/app/panels/text/lib/showdown.js
index 9493071ca68..0286b0598f1 100644
--- a/public/app/panels/text/lib/showdown.js
+++ b/public/app/panels/text/lib/showdown.js
@@ -855,7 +855,7 @@ var _DoLists = function(text) {
 
       // Turn double returns into triple returns, so that we can make a
       // paragraph for the last item in a list, if necessary:
-      list = list.replace(/\n{2,}/g,"\n\n\n");;
+      list = list.replace(/\n{2,}/g,"\n\n\n");
       var result = _ProcessListItems(list);
 
       // Trim any trailing whitespace, to put the closing `</$list_type>`
@@ -875,7 +875,7 @@ var _DoLists = function(text) {
       var list_type = (m3.search(/[*+-]/g)>-1) ? "ul" : "ol";
       // Turn double returns into triple returns, so that we can make a
       // paragraph for the last item in a list, if necessary:
-      var list = list.replace(/\n{2,}/g,"\n\n\n");;
+      list = list.replace(/\n{2,}/g,"\n\n\n");
       var result = _ProcessListItems(list);
       result = runup + "<"+list_type+">\n" + result + "</"+list_type+">\n";
       return result;
@@ -1451,4 +1451,4 @@ if (typeof define === 'function' && define.amd) {
     define(function() {
         return Showdown;
     });
-}
\ No newline at end of file
+}
diff --git a/public/app/plugins/datasource/influxdb/query_builder.js b/public/app/plugins/datasource/influxdb/query_builder.js
index 9ab0953b576..b6b4ae0087c 100644
--- a/public/app/plugins/datasource/influxdb/query_builder.js
+++ b/public/app/plugins/datasource/influxdb/query_builder.js
@@ -161,8 +161,7 @@ function (_) {
   };
 
   p._modifyRawQuery = function () {
-    var query = this.target.query.replace(";", "");
-    return query;
+    return this.target.query.replace(";", "");
   };
 
   return InfluxQueryBuilder;
diff --git a/public/app/plugins/datasource/prometheus/datasource.js b/public/app/plugins/datasource/prometheus/datasource.js
index 2c9279cee96..509b0ce9970 100644
--- a/public/app/plugins/datasource/prometheus/datasource.js
+++ b/public/app/plugins/datasource/prometheus/datasource.js
@@ -111,11 +111,9 @@ function (angular, _, moment, dateMath) {
       var url = '/api/v1/label/__name__/values';
 
       return this._request('GET', url).then(function(result) {
-        var suggestData = _.filter(result.data.data, function(metricName) {
-          return metricName.indexOf(query) !==  1;
+        return _.filter(result.data.data, function (metricName) {
+          return metricName.indexOf(query) !== 1;
         });
-
-        return suggestData;
       });
     };