diff --git a/README.md b/README.md
index 1ab0343b..4fcb201c 100644
--- a/README.md
+++ b/README.md
@@ -350,7 +350,7 @@ Type: `number` Default: `0.8` Min: `0` Max: `1`
 
 You can use this setting to adjust the probability (from 0 to 1) that a string literal will be inserted into the `stringArray`.
 
-This setting is useful with large code size because repeatdely calls to the `stringArray` array can slightly slow down your code.
+This setting is useful with large code size because repeatdely calls to the string array can slightly slow down your code.
 
 `stringArrayThreshold: 0` equals to `stringArray: false`.
 
diff --git a/src/Obfuscator.ts b/src/Obfuscator.ts
index 5f8842d7..aaad46ed 100644
--- a/src/Obfuscator.ts
+++ b/src/Obfuscator.ts
@@ -29,7 +29,7 @@ export class Obfuscator implements IObfuscator {
     /**
      * @type {Map<string, NodeTransformers[]>}
      */
-    private static readonly nodeControlFlowTransformersMap: Map <string, NodeTransformers[]> = new Map <string, NodeTransformers[]> ([
+    private static readonly nodeControlFlowTransformersMap: Map <string, NodeTransformers[]> = new Map([
         [NodeType.FunctionDeclaration, [NodeTransformers.FunctionControlFlowTransformer]],
         [NodeType.FunctionExpression, [NodeTransformers.FunctionControlFlowTransformer]]
     ]);
@@ -37,7 +37,7 @@ export class Obfuscator implements IObfuscator {
     /**
      * @type {Map<string, NodeTransformers[]>}
      */
-    private static readonly nodeObfuscatorsMap: Map <string, NodeTransformers[]> = new Map <string, NodeTransformers[]> ([
+    private static readonly nodeObfuscatorsMap: Map <string, NodeTransformers[]> = new Map([
         [NodeType.ArrowFunctionExpression, [NodeTransformers.FunctionObfuscator]],
         [NodeType.ClassDeclaration, [NodeTransformers.FunctionDeclarationObfuscator]],
         [NodeType.CatchClause, [NodeTransformers.CatchClauseObfuscator]],
diff --git a/src/container/modules/node-transformers/NodeControlFlowTransformersModule.ts b/src/container/modules/node-transformers/NodeControlFlowTransformersModule.ts
index 54ab5c27..a4c175aa 100644
--- a/src/container/modules/node-transformers/NodeControlFlowTransformersModule.ts
+++ b/src/container/modules/node-transformers/NodeControlFlowTransformersModule.ts
@@ -14,7 +14,7 @@ export const nodeControlFlowTransformersModule: interfaces.ContainerModule = new
 
     bind<IControlFlowReplacer>(ServiceIdentifiers['Factory<IControlFlowReplacer>'])
         .toFactory<IControlFlowReplacer>((context: interfaces.Context) => {
-            const cache: Map <NodeControlFlowReplacers, IControlFlowReplacer> = new Map <NodeControlFlowReplacers, IControlFlowReplacer> ();
+            const cache: Map <NodeControlFlowReplacers, IControlFlowReplacer> = new Map();
 
             return (replacerName: NodeControlFlowReplacers) => {
                 if (cache.has(replacerName)) {
diff --git a/src/container/modules/node-transformers/NodeObfuscatorsModule.ts b/src/container/modules/node-transformers/NodeObfuscatorsModule.ts
index be33660a..ab921f8f 100644
--- a/src/container/modules/node-transformers/NodeObfuscatorsModule.ts
+++ b/src/container/modules/node-transformers/NodeObfuscatorsModule.ts
@@ -29,7 +29,7 @@ export const nodeObfuscatorsModule: interfaces.ContainerModule = new ContainerMo
 
     bind<IObfuscatorReplacer>(ServiceIdentifiers['Factory<IObfuscatorReplacer>'])
         .toFactory<IObfuscatorReplacer>((context: interfaces.Context) => {
-            const cache: Map <NodeObfuscatorsReplacers, IObfuscatorReplacer> = new Map <NodeObfuscatorsReplacers, IObfuscatorReplacer> ();
+            const cache: Map <NodeObfuscatorsReplacers, IObfuscatorReplacer> = new Map();
 
             return (replacerName: NodeObfuscatorsReplacers) => {
                 if (cache.has(replacerName)) {
diff --git a/src/container/modules/node-transformers/NodeTransformersModule.ts b/src/container/modules/node-transformers/NodeTransformersModule.ts
index 6e200c76..f45d3db9 100644
--- a/src/container/modules/node-transformers/NodeTransformersModule.ts
+++ b/src/container/modules/node-transformers/NodeTransformersModule.ts
@@ -63,7 +63,7 @@ export const nodeTransformersModule: interfaces.ContainerModule = new ContainerM
     // node transformers factory
     bind<INodeTransformer[]>(ServiceIdentifiers['Factory<INodeTransformer[]>'])
         .toFactory<INodeTransformer[]>((context: interfaces.Context) => {
-            const cache: Map <NodeTransformers, INodeTransformer> = new Map <NodeTransformers, INodeTransformer> ();
+            const cache: Map <NodeTransformers, INodeTransformer> = new Map();
 
             return (nodeTransformersMap: Map<string, NodeTransformers[]>) => (nodeType: string) => {
                 const nodeTransformers: NodeTransformers[] = nodeTransformersMap.get(nodeType) || [];
diff --git a/src/container/modules/stack-trace-analyzer/StackTraceAnalyzerModule.ts b/src/container/modules/stack-trace-analyzer/StackTraceAnalyzerModule.ts
index d09b8009..8d2f52c7 100644
--- a/src/container/modules/stack-trace-analyzer/StackTraceAnalyzerModule.ts
+++ b/src/container/modules/stack-trace-analyzer/StackTraceAnalyzerModule.ts
@@ -32,7 +32,7 @@ export const stackTraceAnalyzerModule: interfaces.ContainerModule = new Containe
     // node transformers factory
     bind<ICalleeDataExtractor>(ServiceIdentifiers['Factory<ICalleeDataExtractor>'])
         .toFactory<ICalleeDataExtractor>((context: interfaces.Context) => {
-            const cache: Map <CalleeDataExtractors, ICalleeDataExtractor> = new Map <CalleeDataExtractors, ICalleeDataExtractor> ();
+            const cache: Map <CalleeDataExtractors, ICalleeDataExtractor> = new Map();
 
             return (calleeDataExtractorName: CalleeDataExtractors) => {
                 if (cache.has(calleeDataExtractorName)) {
diff --git a/src/node-transformers/node-control-flow-transformers/FunctionControlFlowTransformer.ts b/src/node-transformers/node-control-flow-transformers/FunctionControlFlowTransformer.ts
index 450ba884..2b5cdfb8 100644
--- a/src/node-transformers/node-control-flow-transformers/FunctionControlFlowTransformer.ts
+++ b/src/node-transformers/node-control-flow-transformers/FunctionControlFlowTransformer.ts
@@ -30,7 +30,7 @@ export class FunctionControlFlowTransformer extends AbstractNodeTransformer {
     /**
      * @type {Map <string, NodeControlFlowReplacers>}
      */
-    private static readonly controlFlowReplacersMap: Map <string, NodeControlFlowReplacers> = new Map <string, NodeControlFlowReplacers> ([
+    private static readonly controlFlowReplacersMap: Map <string, NodeControlFlowReplacers> = new Map([
         [NodeType.BinaryExpression, NodeControlFlowReplacers.BinaryExpressionControlFlowReplacer]
     ]);
 
@@ -52,7 +52,7 @@ export class FunctionControlFlowTransformer extends AbstractNodeTransformer {
     /**
      * @type {Map<ESTree.Node, IStorage<ICustomNode>>}
      */
-    private controlFlowData: Map <ESTree.Node, IStorage<ICustomNode>> = new Map <ESTree.Node, IStorage<ICustomNode>> ();
+    private controlFlowData: Map <ESTree.Node, IStorage<ICustomNode>> = new Map();
 
     /**
      * @type {TStatement[][]}
diff --git a/src/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts b/src/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts
index 7694291a..85513c4e 100644
--- a/src/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts
+++ b/src/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts
@@ -62,7 +62,7 @@ export class BinaryExpressionControlFlowReplacer extends AbstractControlFlowRepl
             storageKeysByBinaryOperator = <Map<ESTree.BinaryOperator, string[]>>binaryOperatorsDataByControlFlowStorageId
                 .get(controlFlowStorageId);
         } else {
-            storageKeysByBinaryOperator = new Map();
+            storageKeysByBinaryOperator = new Map <ESTree.BinaryOperator, string[]> ();
         }
 
         return storageKeysByBinaryOperator;
diff --git a/src/node-transformers/node-obfuscators/replacers/IdentifierReplacer.ts b/src/node-transformers/node-obfuscators/replacers/IdentifierReplacer.ts
index dbf58645..35616ffa 100644
--- a/src/node-transformers/node-obfuscators/replacers/IdentifierReplacer.ts
+++ b/src/node-transformers/node-obfuscators/replacers/IdentifierReplacer.ts
@@ -12,7 +12,7 @@ export class IdentifierReplacer extends AbstractReplacer implements IObfuscatorR
     /**
      * @type {Map<string, string>}
      */
-    private readonly namesMap: Map<string, string> = new Map<string, string>();
+    private readonly namesMap: Map<string, string> = new Map();
 
     /**
      * @param options