diff --git a/.eslintrc b/.eslintrc
index fc4eadb9b2..8e01cc4c94 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,7 +4,7 @@ env:
 
 rules:
   # Possible Errors
-  # https://github.com/eslint/eslint/tree/master/docs/rules#possible-errors
+  # http://eslint.org/docs/rules/#possible-errors
   comma-dangle: [2, "only-multiline"]
   no-control-regex: 2
   no-debugger: 2
@@ -28,12 +28,17 @@ rules:
   valid-typeof: 2
 
   # Best Practices
-  # https://github.com/eslint/eslint/tree/master/docs/rules#best-practices
+  # http://eslint.org/docs/rules/#best-practices
   no-fallthrough: 2
   no-octal: 2
   no-redeclare: 2
+  no-self-assign: 2
   no-unused-labels: 2
 
+  # Strict Mode
+  # http://eslint.org/docs/rules/#strict-mode
+  strict: [2, "global"]
+
   # Variables
   # http://eslint.org/docs/rules/#variables
   no-delete-var: 2
@@ -48,7 +53,7 @@ rules:
   no-restricted-modules: [2, "sys", "_linklist"]
 
   # Stylistic Issues
-  # https://github.com/eslint/eslint/tree/master/docs/rules#stylistic-issues
+  # http://eslint.org/docs/rules/#stylistic-issues
   comma-spacing: 2
   eol-last: 2
   indent: [2, 2, {SwitchCase: 1}]
@@ -79,10 +84,6 @@ rules:
   no-this-before-super: 2
   prefer-const: 2
 
-  # Strict Mode
-  # https://github.com/eslint/eslint/tree/master/docs/rules#strict-mode
-  strict: [2, "global"]
-
   # Custom rules in tools/eslint-rules
   new-with-error: [2, "Error", "RangeError", "TypeError", "SyntaxError", "ReferenceError"]
 
diff --git a/benchmark/buffers/buffer-base64-decode.js b/benchmark/buffers/buffer-base64-decode.js
index 76850c1231..23ab92462f 100644
--- a/benchmark/buffers/buffer-base64-decode.js
+++ b/benchmark/buffers/buffer-base64-decode.js
@@ -1,13 +1,13 @@
-var assert = require('assert');
-var common = require('../common.js');
+const assert = require('assert');
+const common = require('../common.js');
 
-var bench = common.createBenchmark(main, {});
+const bench = common.createBenchmark(main, {});
 
 function main(conf) {
-  for (var s = 'abcd'; s.length < 32 << 20; s += s);
+  const s = 'abcd'.repeat(8 << 20);
   s.match(/./);  // Flatten string.
   assert.equal(s.length % 4, 0);
-  var b = Buffer(s.length / 4 * 3);
+  const b = Buffer(s.length / 4 * 3);
   b.write(s, 0, s.length, 'base64');
   bench.start();
   for (var i = 0; i < 32; i += 1) b.base64Write(s, 0, s.length);