diff --git a/.prettierrc b/.prettierrc
index dcb72794f..cbf10dec4 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,5 @@
 {
   "singleQuote": true,
-  "trailingComma": "all"
+  "trailingComma": "all",
+  "quoteProps": "preserve",
 }
\ No newline at end of file
diff --git a/bin/nest.ts b/bin/nest.ts
index 977a9b20b..bebab0b1e 100755
--- a/bin/nest.ts
+++ b/bin/nest.ts
@@ -6,8 +6,8 @@ import { CommandLoader } from '../commands';
 const bootstrap = () => {
   const program: CommanderStatic = commander;
   program
-  .version(require('../package.json').version)
-  .usage('<command> [options]');
+    .version(require('../package.json').version)
+    .usage('<command> [options]');
   CommandLoader.load(program);
   commander.parse(process.argv);
 
diff --git a/commands/generate.command.ts b/commands/generate.command.ts
index 6847a18af..8f6cd7ecb 100644
--- a/commands/generate.command.ts
+++ b/commands/generate.command.ts
@@ -65,12 +65,10 @@ export class GenerateCommand extends AbstractCommand {
     const tableConfig = {
       head: ['name', 'alias'],
       chars: {
-        // tslint:disable-next-line:quotemark
-        "left": leftMargin.concat('│'),
+        'left': leftMargin.concat('│'),
         'top-left': leftMargin.concat('┌'),
         'bottom-left': leftMargin.concat('└'),
-        // tslint:disable-next-line:quotemark
-        "mid": '',
+        'mid': '',
         'left-mid': '',
         'mid-mid': '',
         'right-mid': '',
diff --git a/package.json b/package.json
index 5f34ef19d..707aab470 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "build": "tsc",
     "clean": "gulp clean:bundle",
     "format": "prettier --write \"**/*.ts\"",
-    "lint": "./node_modules/tslint/bin/tslint -p .",
+    "lint": "tslint -p .",
     "start": "node bin/nest.js",
     "test": "jest --config test/jest-config.json",
     "test:dev": "jest --config test/jest-config.json --watchAll"
diff --git a/tools/gulp/gulpfile.ts b/tools/gulp/gulpfile.ts
index f72d171b5..8affe48a9 100644
--- a/tools/gulp/gulpfile.ts
+++ b/tools/gulp/gulpfile.ts
@@ -1,2 +1 @@
 import './tasks/clean';
-