diff -u b/src/Form/NodeRevisionDeleteAdminSettings.php b/src/Form/NodeRevisionDeleteAdminSettings.php
--- b/src/Form/NodeRevisionDeleteAdminSettings.php
+++ b/src/Form/NodeRevisionDeleteAdminSettings.php
@@ -126,8 +126,10 @@
         $rev_recency = is_numeric($minimum_age_to_delete_number) && intval($minimum_age_to_delete_number) > 0 ? new \DateTime($minimum_age_to_delete_format) : NULL;
         $when_to_delete_format = $this->getConvertibleTimeFormat('when_to_delete', $when_to_delete_number);
         $skip_nodes_more_recently_modified_than = is_numeric($when_to_delete_number) && intval($when_to_delete_number) > 0 ? new \DateTime($when_to_delete_format) : NULL;
+
         $reqQuery = new RevisionQuery($content_type, $minimum_revisions_to_keep, $rev_recency, $skip_nodes_more_recently_modified_than);
         $candidate_nodes = $reqQuery->countAffectedNodes();
+
         // If we have candidates nodes then we will allow to run the batch job.
         if ($candidate_nodes && !$exists_candidates_nodes) {
           $exists_candidates_nodes = TRUE;
@@ -299,7 +301,12 @@
     _node_revision_delete_update_time_max_number_config('when_to_delete', $when_to_delete_time_max_number);
     _node_revision_delete_update_time_max_number_config('minimum_age_to_delete', $minimum_age_to_delete_time_max_number);
     // Saving the configuration.
-    $this->config('node_revision_delete.settings')->set('node_revision_delete_cron', $form_state->getValue('node_revision_delete_cron'))->set('node_revision_delete_time', $form_state->getValue('node_revision_delete_time'))->set('node_revision_delete_when_to_delete_time', $node_revision_delete_when_to_delete_time)->set('node_revision_delete_minimum_age_to_delete_time', $node_revision_delete_minimum_age_to_delete_time)->save();
+    $this->config('node_revision_delete.settings')
+      ->set('node_revision_delete_cron', $form_state->getValue('node_revision_delete_cron'))
+      ->set('node_revision_delete_time', $form_state->getValue('node_revision_delete_time'))
+      ->set('node_revision_delete_when_to_delete_time', $node_revision_delete_when_to_delete_time)
+      ->set('node_revision_delete_minimum_age_to_delete_time', $node_revision_delete_minimum_age_to_delete_time)
+      ->save();
   }
 
   /**
@@ -311,6 +318,7 @@
    * @param $interval_number
    *
    * @return string
+   *
    * @throws \InvalidArgumentException
    */
   protected function getConvertibleTimeFormat($config_key, $interval_number) {
@@ -319,7 +327,7 @@
     $config_name_time = $config->get('node_revision_delete_' . $config_key . '_time');
 
     if (empty($config_name_time['time']) || !preg_match('/day[s]?|week[s]?|month[s]?|year[s]?/i', $config_name_time['time'])) {
-      throw new \InvalidArgumentException("Invalid or unknown value. We are expecting day,week,month or year");
+      throw new \InvalidArgumentException("Invalid or unknown value. We are expecting day, week, month or year");
     }
     // Is singular or plural?
     return sprintf('%s %s ago', $interval_number, $config_name_time['time']);
diff -u b/src/RevisionQuery.php b/src/RevisionQuery.php
--- b/src/RevisionQuery.php
+++ b/src/RevisionQuery.php
@@ -1,54 +1,57 @@
 <?php
-/**
- * @contains RevisionQuery.php
- * User: goce
- * Date: 12/20/17
- * Time: 10:38 AM
- */
 
 namespace Drupal\node_revision_delete;
 
 use DateTime;
 use Drupal\node\NodeTypeInterface;
 use Drupal\node_revision_delete\WorkQuery\NodeWorkQuery;
-use Drupal\node_revision_delete\WorkQuery\WorkQueryInterface;
-
 
 /**
- * File: RevisionQuery.php
- * Author: goce
- * Created:  2017.12.20
  *
- * Description:
  */
 class RevisionQuery implements RevisionQueryInterface {
 
-  /** @var string */
+  /**
+   * @var string
+   */
   protected $type;
 
-  /** @var int */
+  /**
+   * @var int
+   */
   protected $minRev;
 
-  /** @var \DateTime */
+  /**
+   * @var \DateTime
+   */
   protected $minRetainAge;
 
-  /** @var \DateTime */
+  /**
+   * @var \DateTime
+   */
   protected $nodeInactivityAge;
 
-  /** @var \Drupal\node_revision_delete\WorkQuery\WorkQueryInterface */
+  /**
+   * @var \Drupal\node_revision_delete\WorkQuery\WorkQueryInterface
+   */
   protected $nodeQuery;
 
-  /** @var \Drupal\node_revision_delete\WorkQuery\WorkQueryInterface */
+  /**
+   * @var \Drupal\node_revision_delete\WorkQuery\WorkQueryInterface
+   */
   protected $revQuery;
 
   /**
    * RevisionQuery constructor.
    *
+   * Nodes modified after this datetime will be filtered out and skipped. Null
+   * means the node age filter will not be applied and all nodes will be
+   * considered.
+   *
    * @param \Drupal\node\NodeTypeInterface $content_type
-   * @param int                            $revision_items_to_keep
-   * @param \DateTime|NULL                 $revision_history_to_retain
-   * @param \DateTime|NULL                 $nodeInactivityAge
-   *   Nodes modified after this datetime will be filtered out and skipped. Null means the node age filter will not be applied and all nodes will be considered.
+   * @param int $revision_items_to_keep
+   * @param \DateTime|null $revision_history_to_retain
+   * @param \DateTime|null $nodeInactivityAge
    */
   public function __construct(NodeTypeInterface $content_type, $revision_items_to_keep, DateTime $revision_history_to_retain = NULL, DateTime $nodeInactivityAge = NULL) {
 
@@ -62,12 +65,14 @@
   }
 
   /**
-   * Sets the minimum age to retain for a revision. If NULL then the filter is not applied.
+   * Sets the minimum age to retain for a revision.
    *
-   * This means that revisions older than the specified DateTime will be deleted.
+   * If NULL then the filter is not applied. This means that revisions older
+   * than the specified DateTime will be deleted.
    *
-   * @param \DateTime|NULL $min_age_to_keep
-   *    Revisions older than this date will be removed. A NULL means that this filter will not be applied.
+   * @param \DateTime|null $min_age_to_keep
+   *   Revisions older than this date will be removed. A NULL means that this
+   *    filter will not be applied.
    *
    * @return \Drupal\node_revision_delete\RevisionQueryInterface
    */
@@ -77,6 +82,9 @@
     return $this;
   }
 
+  /**
+   *
+   */
   public function setInactivityAge(DateTime $nodeInactivityAge = NULL) {
     $this->nodeInactivityAge = $nodeInactivityAge;
 
@@ -87,24 +95,26 @@
    * The Node type.
    *
    * @param string $content_type
-   *    The node bundle. Ex. article,basic_page
+   *   The node bundle. Ex. article,basic_page.
    *
    * @return \Drupal\node_revision_delete\RevisionQuery
    */
   public function setType($content_type) {
-    // @todo: should add type validation? If the bundle doesn't exist then no harm no foul.
+    // @todo: Should add type validation? If the bundle doesn't exist then no
+    // harm no foul.
     $this->type = $content_type;
 
     return $this;
   }
 
   /**
-   * Sets the minimum number of revisions for each node to retain. This value will always be equal to, or greater than 1.
+   * Sets the minimum number of revisions for each node to retain.
    *
-   * Invalid values are ignored. This function can be chained.
+   * This value will always be equal to, or greater than 1. Invalid values are
+   * ignored. This function can be chained.
    *
    * @param int $minimum_revisions_to_keep
-   *    The minimum number of revisions to keep for each node.
+   *   The minimum number of revisions to keep for each node.
    *
    * @return \Drupal\node_revision_delete\RevisionQueryInterface
    */
@@ -123,6 +133,9 @@
     return $this->nodeQuery->count();
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function countRemovableRevisions() {
     return $this->revQuery->count();
   }
@@ -134,7 +147,6 @@
     // TODO: Implement fetchRemovable() method.
   }
 
-
   /**
    * @param array $options
    *
@@ -151,9 +163,9 @@
-    //$query->groupBy('n.nid');
-
-    // couldn't use here havingCondition and couldn't use the num_revisions alias. May be an ORM issue.
+    // $query->groupBy('n.nid');
+    // couldn't use here havingCondition and couldn't use the num_revisions
+    // alias. May be an ORM issue.
     $query->having('COUNT(n.nid) > :min_retain_revisions', [':min_retain_revisions' => $this->minRev]);
 
     return $query;
   }
 
-}
\ No newline at end of file
+}
diff -u b/src/RevisionQueryInterface.php b/src/RevisionQueryInterface.php
--- b/src/RevisionQueryInterface.php
+++ b/src/RevisionQueryInterface.php
@@ -1,18 +1,14 @@
 <?php
-/**
- * @contains RevisionQueryInterface.php
- * User: goce
- * Date: 12/20/17
- * Time: 10:38 AM
- */
 
 namespace Drupal\node_revision_delete;
 
-
+/**
+ *
+ */
 interface RevisionQueryInterface {
 
   /**
-   * Counts the number of node entities that have revision records that could be removed.
+   * Counts the node entities that have revision records that could be removed.
    *
    * @return int
    */
@@ -34 +30,2 @@
-}
\ No newline at end of file
+
+}
diff -u b/src/WorkQuery/BaseWorkQuery.php b/src/WorkQuery/BaseWorkQuery.php
--- b/src/WorkQuery/BaseWorkQuery.php
+++ b/src/WorkQuery/BaseWorkQuery.php
@@ -2,44 +2,48 @@
-/**
- * @contains BaseWorkQuery.php
- * User: goce
- * Date: 12/21/17
- * Time: 10:54 AM
- */
 
 namespace Drupal\node_revision_delete\WorkQuery;
 
-use DateTime;
-
-
 /**
- * File: BaseWorkQuery.php
- * Author: goce
- * Created:  2017.12.21
  *
- * Description:
  */
 abstract class BaseWorkQuery implements WorkQueryInterface {
 
-  /** @var \Drupal\Core\Database\Query\SelectInterface */
+  /**
+   * @var \Drupal\Core\Database\Query\SelectInterface
+   */
   protected $query;
 
-  /** @var \Drupal\Core\Database\Connection */
+  /**
+   * @var \Drupal\Core\Database\Connection
+   */
   protected $connection;
 
-  /** @var string */
+  /**
+   * @var string
+   */
   protected $type;
 
-  /** @var int */
+  /**
+   * @var int
+   */
   protected $minRev;
 
-  /** @var \DateTime */
+  /**
+   * @var \DateTime
+   */
   protected $minRetainAge;
 
+  /**
+   *
+   */
   protected function __construct() {
     $this->connection = \Drupal::service('database');
   }
 
+  /**
+   *
+   */
   public static function create() {
     return new static();
   }
-}
\ No newline at end of file
+
+}
diff -u b/src/WorkQuery/NodeWorkQuery.php b/src/WorkQuery/NodeWorkQuery.php
--- b/src/WorkQuery/NodeWorkQuery.php
+++ b/src/WorkQuery/NodeWorkQuery.php
@@ -1,26 +1,24 @@
 <?php
-/**
- * @contains NodeWorkQuery.php
- * User: goce
- * Date: 12/21/17
- * Time: 10:53 AM
- */
 
 namespace Drupal\node_revision_delete\WorkQuery;
 
 use DateTime;
 
 /**
- * Class NodeWorkQuery
+ * Class NodeWorkQuery.
  *
  * @package Drupal\node_revision_delete\WorkQuery
  */
 class NodeWorkQuery extends BaseWorkQuery {
 
   /**
-   * Constructs a complicated query with several subqueries. There is one query that constructs a derived table which filters out nodes based on bundle and the number of revisions
-   * for each node we want to retain. This was done so that no mater what we always retain a minimum number of revisions. There is also an outer query we may use
-   * if we want to filter out node revisions based on their age.
+   * Constructs a complicated query with several subqueries.
+   *
+   * There is one query that constructs a derived table which filters out nodes
+   * based on bundle and the number of revisions for each node we want to
+   * retain. This was done so that no mater what we always retain a minimum
+   * number of revisions. There is also an outer query we may use if we want to
+   * filter out node revisions based on their age.
    *
    * This is an example query that may be produced:
    *
@@ -44,7 +42,8 @@
    */
   public function setQuery($type, $minimum_revisions_to_keep, DateTime $min_rev_age_to_keep = NULL, DateTime $min_node_inactivity_age = NULL) {
     $subQuery = $this->countRevisionSubQuery($type, $minimum_revisions_to_keep, $min_node_inactivity_age);
-    // initially set the revision count query as the main query. It may become a subquery
+    // Initially set the revision count query as the main query. It may become
+    // a subquery.
     $this->query = $subQuery;
 
     if ($min_rev_age_to_keep) {
@@ -60,9 +59,10 @@
   }
 
   /**
-   * Marking as private. The table aliases in this query are defined in the main query.
+   * The table aliases in this query are defined in the main query.
    *
-   * Note: This query operates on a node's CURRENT revision, which may not necessarily be a node's most recent revision.
+   * This query operates on a node's CURRENT revision, which may not necessarily
+   * be a node's most recent revision.
    *
    * @return \Drupal\Core\Database\Query\SelectInterface
    */
@@ -71,17 +71,19 @@
     $subQuery = $this->connection->select('node_revision', 'r2');
     $subQuery->addField('r2', 'revision_timestamp');
     $subQuery->where('r2.vid = n.vid');
-    //$subQuery->orderBy('r2.revision_timestamp', 'DESC');
-    //$subQuery->range(0, 1);
+    // $subQuery->orderBy('r2.revision_timestamp', 'DESC');
+    // $subQuery->range(0, 1);.
     return $subQuery;
 
   }
 
   /**
-   * Constructs a query that returns all the nids and their current vid based on the bundle, and the minimum revision count.
+   * Constructs a query that returns all the nids and their current vid.
    *
-   * @param           $type
-   * @param           $minimum_revisions_to_keep
+   * This is made based on the bundle, and the minimum revision count.
+   *
+   * @param $type
+   * @param $minimum_revisions_to_keep
    * @param \DateTime $min_node_inactivity_age
    *
    * @return \Drupal\Core\Database\Query\SelectInterface
@@ -90,18 +92,21 @@
     /** @var \Drupal\Core\Database\Query\SelectInterface $query */
     $query = $this->connection->select('node', 'n');
     $query->addField('n', 'nid');
-    //$query->addField('n', 'vid');
+    // $query->addField('n', 'vid');.
     $query->addExpression('COUNT(n.nid)', 'num_revisions');
     $query->join('node_revision', 'r', 'n.nid=r.nid');
     $query->condition('n.type', $type);
 
     if ($min_node_inactivity_age instanceof DateTime) {
-      // Construct a WHERE clause to filter out nodes more recent than the $min_rev_age_to_keep. Constructs a WHERE with a SELECT subquery on the CURRENT revision.
+      // Construct a WHERE clause to filter out nodes more recent than the
+      // $min_rev_age_to_keep. Constructs a WHERE with a SELECT subquery on the
+      // CURRENT revision.
       $query->condition($min_node_inactivity_age->format('U'), $this->currentRevisionTimeStampSubQuery(), '>');
     }
 
     $query->groupBy('n.nid');
-    // couldn't use here havingCondition and couldn't use the num_revisions alias.
+    // Couldn't use here havingCondition and couldn't use the num_revisions
+    // alias.
     $query->having('COUNT(n.nid) > :min_retain_revisions', [':min_retain_revisions' => $minimum_revisions_to_keep]);
 
     return $query;
@@ -125,2 +130,3 @@
   }
+
 }
diff -u b/src/WorkQuery/RevisionWorkQuery.php b/src/WorkQuery/RevisionWorkQuery.php
--- b/src/WorkQuery/RevisionWorkQuery.php
+++ b/src/WorkQuery/RevisionWorkQuery.php
@@ -2,33 +2,32 @@
-/**
- * @contains RevisionWorkQuery.php
- * User: goce
- * Date: 12/21/17
- * Time: 3:33 PM
- */
 
 namespace Drupal\node_revision_delete\WorkQuery;
 
 use DateTime;
 
-
 /**
- * File: RevisionWorkQuery.php
- * Author: goce
- * Created:  2017.12.21
  *
- * Description:
  */
 class RevisionWorkQuery extends BaseWorkQuery {
 
+  /**
+   *
+   */
   public function setQuery($type, $minRevRetain, DateTime $minAgeRetain) {
     // TODO: Implement setQuery() method.
   }
 
+  /**
+   *
+   */
   public function count() {
     // TODO: Implement count() method.
   }
 
+  /**
+   *
+   */
   public function fetchRecords() {
     // TODO: Implement fetchRecords() method.
   }
-}
\ No newline at end of file
+
+}
diff -u b/src/WorkQuery/WorkQueryInterface.php b/src/WorkQuery/WorkQueryInterface.php
--- b/src/WorkQuery/WorkQueryInterface.php
+++ b/src/WorkQuery/WorkQueryInterface.php
@@ -1,16 +1,12 @@
 <?php
-/**
- * @contains WorkQueryInterface.php
- * User: goce
- * Date: 12/21/17
- * Time: 10:51 AM
- */
 
 namespace Drupal\node_revision_delete\WorkQuery;
 
-
 use DateTime;
 
+/**
+ *
+ */
 interface WorkQueryInterface {
 
   /**
@@ -27,13 +23,15 @@
-   * @param string    $type
-   * @param int       $minRevRetain
+   * @param string $type
+   * @param int $minRevRetain
    * @param \DateTime $minAgeRetain
    *   Skip revisions created before this DateTime.
    *
    * @param \DateTime $minNodeInactivityAge
-   *   Skip nodes altogether whose most recent revision is after this variable's value.
+   *   Skip nodes altogether whose most recent revision is after this variable's
+   *   value.
    *
    * @return \Drupal\node_revision_delete\WorkQuery\WorkQueryInterface
    *   Returns an instance of the object for convenient chaining.
    */
   public function setQuery($type, $minRevRetain, DateTime $minAgeRetain = NULL, DateTime $minNodeInactivityAge = NULL);
-}
\ No newline at end of file
+
+}