diff --git a/README.md b/README.md
index f6572c5..ad16a37 100644
--- a/README.md
+++ b/README.md
@@ -24,13 +24,13 @@ https://www.drupal.org/documentation/install/modules-themes/modules-8
 for further information.
 
 ## CONFIGURATION
-Open any target view and open settings form of any string or numeric filter.Then check
-field "Use tokens in value" in settings form and add global tokens to filter
-value.
+Open any target view and open settings form of any string or numeric filter.
+Then check field "Use tokens in value" in settings form and add global
+tokens to filter value.
 
 ## FOR DEVELOPERS
-You can use your own plugins to implement token views filters via Token Views Filter 
-Plugin manager.
+You can use your own plugins to implement token views filters via Token
+Views Filter Plugin manager.
 To create plugin put it to `src/Plugin/views/filter/token` folder and define 
 with ID as original views filter plugin, like
 
@@ -82,12 +82,12 @@ class TokensStringFilter extends StringFilter implements TokenViewsFilterPluginI
 ### Schema definition
 
 To use token views filter you should redefine original views filter schema 
-in your module in file `config/schema/{module_name}.schema.yml`
+in your module in file `config / schema / {module_name} . schema . yml`
 
 For example:
 
 ```
-views.filter.string:
+views . filter . string:
   type: views_filter
   label: 'String'
   mapping:
diff --git a/src/TokensFilterTrait.php b/src/TokensFilterTrait.php
index 439af4e..8acf48d 100644
--- a/src/TokensFilterTrait.php
+++ b/src/TokensFilterTrait.php
@@ -73,7 +73,7 @@ trait TokensFilterTrait {
   /**
    * {@inheritdoc}
    *
-   * Replace tokens
+   * Replace tokens.
    */
   public function preQuery() {
     parent::preQuery();
@@ -86,9 +86,9 @@ trait TokensFilterTrait {
   /**
    * {@inheritDoc}
    *
-   * In case of grouped filters we have to override the parent FilterPluginBase 
+   * In case of grouped filters we have to override the parent FilterPluginBase
    * method so that we can tokenize the individual group_item's value.
-   * 
+   *
    * @see \Drupal\views\Plugin\views\filter\FilterPluginBase::convertExposedInput()
    */
   public function convertExposedInput(&$input, $selected_group_id = NULL) {
@@ -110,7 +110,7 @@ trait TokensFilterTrait {
       if (isset($selected_group) && isset($this->options['group_info']['group_items'][$selected_group])) {
         $input[$this->options['expose']['operator']] = $this->options['group_info']['group_items'][$selected_group]['operator'];
 
-        // Value can be optional, For example for 'empty' and 'not empty' filters.
+        // Value can be optional, for example 'empty' and 'not empty' filters.
         if (isset($this->options['group_info']['group_items'][$selected_group]['value']) && $this->options['group_info']['group_items'][$selected_group]['value'] !== '') {
 
           if (!empty($this->options['use_tokens'])) {
@@ -137,4 +137,3 @@ trait TokensFilterTrait {
   }
 
 }
-
diff --git a/tests/modules/token_views_filter_test/token_views_filter_test.tokens.inc b/tests/modules/token_views_filter_test/token_views_filter_test.tokens.inc
index 7d01cbe..107c2f0 100644
--- a/tests/modules/token_views_filter_test/token_views_filter_test.tokens.inc
+++ b/tests/modules/token_views_filter_test/token_views_filter_test.tokens.inc
@@ -1,9 +1,14 @@
 <?php
 
-use \Drupal\Core\Render\BubbleableMetadata;
+/**
+ * @file
+ * Contains the hook implementation for token view filter test.
+ */
+
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
- * Implements hook_token_info()
+ * Implements hook_token_info().
  */
 function token_views_filter_test_token_info() {
   $types['test'] = [
@@ -24,7 +29,6 @@ function token_views_filter_test_token_info() {
   ];
 }
 
-
 /**
  * Implements hook_tokens().
  */
diff --git a/tests/src/Functional/TokenViewsFilterTest.php b/tests/src/Functional/TokenViewsFilterTest.php
index 69fb8b5..7541761 100644
--- a/tests/src/Functional/TokenViewsFilterTest.php
+++ b/tests/src/Functional/TokenViewsFilterTest.php
@@ -25,7 +25,11 @@ class TokenViewsFilterTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = ['views_ui', 'token_views_filter', 'token_views_filter_test'];
+  public static $modules = [
+    'views_ui',
+    'token_views_filter',
+    'token_views_filter_test',
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/tests/src/Kernel/TokenReplacementTest.php b/tests/src/Kernel/TokenReplacementTest.php
index 7b76689..526794d 100644
--- a/tests/src/Kernel/TokenReplacementTest.php
+++ b/tests/src/Kernel/TokenReplacementTest.php
@@ -25,7 +25,11 @@ class TokenReplacementTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = ['token_views_filter', 'token', 'token_views_filter_test'];
+  public static $modules = [
+    'token_views_filter',
+    'token',
+    'token_views_filter_test',
+  ];
 
   /**
    * {@inheritdoc}
@@ -77,7 +81,7 @@ class TokenReplacementTest extends ViewsKernelTestBase {
         'min' => '',
         'max' => '',
         'value' => date('Y-m-d'),
-        'type' => 'date'
+        'type' => 'date',
       ],
       $view->filter['test_filter_date']->value
     );
@@ -87,7 +91,7 @@ class TokenReplacementTest extends ViewsKernelTestBase {
         'min' => '',
         'max' => '',
         'value' => date('Y-m-d'),
-        'type' => 'date'
+        'type' => 'date',
       ],
       $view->filter['test_filter_datetime']->value
     );
@@ -136,7 +140,7 @@ class TokenReplacementTest extends ViewsKernelTestBase {
         'min' => '',
         'max' => '',
         'value' => '[current-date:custom:Y-m-d]',
-        'type' => 'date'
+        'type' => 'date',
       ],
       $view->filter['test_filter_date']->value
     );
@@ -146,13 +150,12 @@ class TokenReplacementTest extends ViewsKernelTestBase {
         'min' => '',
         'max' => '',
         'value' => '[current-date:custom:Y-m-d]',
-        'type' => 'date'
+        'type' => 'date',
       ],
       $view->filter['test_filter_datetime']->value
     );
   }
 
-
   /**
    * Tests empty token replacement in filters.
    */
diff --git a/token_views_filter.views.inc b/token_views_filter.views.inc
index 489c669..b9ffb0b 100644
--- a/token_views_filter.views.inc
+++ b/token_views_filter.views.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Primarily Drupal hooks to manipulate Token Views Filter.
+ * Primarily Drupal hooks to manipulate token views filter.
  */
 
 /**