diff --git a/.eslintrc.json b/.eslintrc.json
index c4dbbab4..12724a97 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -12,10 +12,11 @@
     "prettier/prettier": "error",
     "block-scoped-var": "error",
     "eqeqeq": "error",
-    "no-warning-comments": "warn",
     "no-var": "error",
     "prefer-const": "error",
-    "eol-last": "error"
+    "eol-last": "error",
+    "prefer-arrow-callback": "error",
+    "no-trailing-spaces": "error"
   },
   "overrides": [
     {
diff --git a/.prettierrc.json b/.prettierrc.json
index c0d494b2..1f486128 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,5 +1,5 @@
 {
   "bracketSpacing": false,
   "singleQuote": true,
-  "trailingComma": "es5"
+  "arrowParens": "avoid"
 }
diff --git a/package-lock.json b/package-lock.json
index a21837d0..17d9e4ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2787,9 +2787,9 @@
       "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
     },
     "prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.0.tgz",
+      "integrity": "sha512-vI55PC+GFLOVtpwr2di1mYhJF36v+kztJov8sx3AmqbfdA+2Dhozxb+3e1hTgoV9lyhnVJFF3Z8GCVeMBOS1bA=="
     },
     "prettier-linter-helpers": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 1a5eae7a..ca090da4 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "inquirer": "^7.0.0",
     "meow": "^6.0.0",
     "ncp": "^2.0.0",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.0",
     "rimraf": "^3.0.0",
     "update-notifier": "^4.0.0",
     "write-file-atomic": "^3.0.0"
diff --git a/test/test-init.ts b/test/test-init.ts
index c3e26bab..9766e45a 100644
--- a/test/test-init.ts
+++ b/test/test-init.ts
@@ -66,11 +66,11 @@ function hasExpectedDependencies(packageJson: PackageJson): boolean {
 describe('init', () => {
   const sandbox = sinon.createSandbox();
 
-  beforeEach(function() {
+  beforeEach(function () {
     this.spawnSyncStub = sandbox.stub(cp, 'spawnSync');
   });
 
-  afterEach(function() {
+  afterEach(function () {
     this.spawnSyncStub.restore();
   });