diff --git a/.php_cs.dist b/.php_cs.dist
index e787c8a..242844f 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -1,9 +1,13 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->in([
-        __DIR__ . '/src',
-        __DIR__ . '/tests',
+    ->in(__DIR__)
+    ->exclude([
+        'build',
+        'vendor',
+    ])
+    ->notPath([
+        'tests/Resources/var/',
     ])
 ;
 
@@ -12,6 +16,7 @@ return PhpCsFixer\Config::create()
         '@Symfony'                            => true,
         '@PhpCsFixer'                         => true,
         '@PHP71Migration'                     => true,
+        'array_syntax'                        => ['syntax' => 'short'],
         'binary_operator_spaces'              => [
             'align_double_arrow' => true,
         ],
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c694dcf..b30d4fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Common and useful classes, methods, exceptions etc.
 2. Docker > use images (instead of Dockerfiles)
 3. composer > squizlabs/php_codesniffer package > use ^3.4 (instead of ^2.9)
 4. Do not require name of class by BaseTestCaseTrait::assertMethodVisibilityAndArguments() method
+5. PHP CS Fixer > configuration > make more readable & remove unnecessary code
 
 # 1.0.5