diff --git a/Tests/Controller/BasicSearchTest.php b/Tests/Controller/BasicSearchTest.php
index d25b1ab..41b9301 100644
--- a/Tests/Controller/BasicSearchTest.php
+++ b/Tests/Controller/BasicSearchTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\custom_solr_search\Tests\BasicSearch.
- */
-
 namespace Drupal\custom_solr_search\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -13,6 +8,7 @@ use Drupal\simpletest\WebTestBase;
  * Provides automated tests for the custom_solr_search module.
  */
 class BasicSearchTest extends WebTestBase {
+
   /**
    * {@inheritdoc}
    */
diff --git a/custom_solr_search.module b/custom_solr_search.module
index e125cdc..7175342 100644
--- a/custom_solr_search.module
+++ b/custom_solr_search.module
@@ -27,7 +27,7 @@ function custom_solr_search_help($route_name, RouteMatchInterface $route_match)
  * Implements hook_theme().
  */
 function custom_solr_search_theme($existing, $type, $theme, $path) {
-  return array (
+  return array(
     'custom_solr_search_result_item' => array(
       'variables' => array(
         'url' => NULL,
@@ -39,4 +39,4 @@ function custom_solr_search_theme($existing, $type, $theme, $path) {
       ),
     ),
   );
-}
\ No newline at end of file
+}
diff --git a/src/Controller/BasicSearch.php b/src/Controller/BasicSearch.php
index 7af6ee2..134e481 100644
--- a/src/Controller/BasicSearch.php
+++ b/src/Controller/BasicSearch.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\custom_solr_search\Controller\BasicSearch.
- */
-
 namespace Drupal\custom_solr_search\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
@@ -50,7 +45,7 @@ class BasicSearch extends ControllerBase {
           '#author' => $result->author_sort,
           '#publishDate' => $result->publishDate[0],
           '#publisher' => $result->publisher[0],
-          '#topic' => $result->topic[0].', '.$result->topic[0]
+          '#topic' => $result->topic[0] . ', ' . $result->topic[0],
         );
       }
     }
diff --git a/src/Form/CustomSolrConfigForm.php b/src/Form/CustomSolrConfigForm.php
index 6841b9f..ac960d5 100644
--- a/src/Form/CustomSolrConfigForm.php
+++ b/src/Form/CustomSolrConfigForm.php
@@ -47,9 +47,11 @@ class CustomSolrConfigForm extends EntityForm {
    * @return \Drupal\Core\Entity\EntityStorageInterface
    *   The server storage controller.
    */
-  protected function getStorage(){
+  protected function getStorage() {
+
     return $this->storage ?: \Drupal::service('entity_type.manager')->getStorage('custom_solr_config');
   }
+
   /**
    * {@inheritdoc}
    */
@@ -75,49 +77,49 @@ class CustomSolrConfigForm extends EntityForm {
     }
 
     $this->buildEntityForm($form, $form_state, $custom_solr_config);
-    
-    
     return $form;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function buildEntityForm(array &$form, FormStateInterface $form_state, CustomSolrConfig $server) {
     $form['name'] = array(
-        '#type' => 'textfield',
-        '#title' => $this->t('Server name'),
-        '#description' => $this->t('Enter the displayed name for the server.'),
-        '#default_value' => $server->label(),
-        '#required' => TRUE,
+      '#type' => 'textfield',
+      '#title' => $this->t('Server name'),
+      '#description' => $this->t('Enter the displayed name for the server.'),
+      '#default_value' => $server->label(),
+      '#required' => TRUE,
     );
     $form['id'] = array(
-        '#type' => 'machine_name',
-        '#default_value' => $server->id(),
-        '#maxlength' => 50,
-        '#required' => TRUE,
-        '#machine_name' => array(
-            'exists' => array($this->getStorage(), 'load'),
-            'source' => array('name'),
-        ),
-        '#disabled' => !$server->isNew(),
+      '#type' => 'machine_name',
+      '#default_value' => $server->id(),
+      '#maxlength' => 50,
+      '#required' => TRUE,
+      '#machine_name' => array(
+        'exists' => array($this->getStorage(), 'load'),
+        'source' => array('name'),
+      ),
+      '#disabled' => !$server->isNew(),
     );
     $form['status'] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Enabled'),
-        '#description' => $this->t('Only enabled servers can index items or execute searches.'),
-        '#default_value' => $server->status(),
+      '#type' => 'checkbox',
+      '#title' => $this->t('Enabled'),
+      '#description' => $this->t('Only enabled servers can index items or execute searches.'),
+      '#default_value' => $server->status(),
     );
     $form['description'] = array(
-        '#type' => 'textarea',
-        '#title' => $this->t('Description'),
-        '#description' => $this->t('Enter a description for the server.'),
-        //'#default_value' => $server->getDescription(),
+      '#type' => 'textarea',
+      '#title' => $this->t('Description'),
+      '#description' => $this->t('Enter a description for the server.'),
     );
     $form['protocall'] = array(
-        '#type' => 'textarea',
-        '#title' => $this->t('Description'),
-        '#description' => $this->t('Enter a description for the server.'),
-      //'#default_value' => $server->getDescription(),
+      '#type' => 'textarea',
+      '#title' => $this->t('Description'),
+      '#description' => $this->t('Enter a description for the server.'),
     );
-    //return $form;
+
+    // Commenting this form /return $form;/ .
   }
 
   /**
diff --git a/src/Form/SearchForm.php b/src/Form/SearchForm.php
index 1424351..59407ba 100644
--- a/src/Form/SearchForm.php
+++ b/src/Form/SearchForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\custom_solr_search\Form\SearchForm.
- */
-
 namespace Drupal\custom_solr_search\Form;
 
 use Drupal\Core\Form\FormBase;
diff --git a/src/Plugin/Block/CustomSolrSearchResultBlock.php b/src/Plugin/Block/CustomSolrSearchResultBlock.php
index 6deff22..fa4fce2 100644
--- a/src/Plugin/Block/CustomSolrSearchResultBlock.php
+++ b/src/Plugin/Block/CustomSolrSearchResultBlock.php
@@ -11,7 +11,7 @@ use Drupal\custom_solr_search\Search;
 use Drupal\custom_solr_search\SearchSolrAll;
 
 /**
- * Provides a 'Result' Block
+ * Provides a 'Result' Block.
  *
  * @Block(
  *   id = "custom_solr_search_result_block",
@@ -21,21 +21,21 @@ use Drupal\custom_solr_search\SearchSolrAll;
 class CustomSolrSearchResultBlock extends BlockBase implements ContainerFactoryPluginInterface {
 
   /**
-   * \Drupal\custom_solr_search\Search definition.
+   * Drupal\custom_solr_search\Search definition.
    *
    * @var \Drupal\custom_solr_search\Search
    */
   protected $search;
 
   /**
-   * \Drupal\custom_solr_search\SolrServerDetails definition.
+   * Drupal\custom_solr_search\SolrServerDetails definition.
    *
    * @var \Drupal\custom_solr_search\SolrServerDetails
    */
   protected $serverDetails;
 
   /**
-   * \Drupal\custom_solr_search\Search definition.
+   * Drupal\custom_solr_search\Search definition.
    *
    * @var \Drupal\custom_solr_search\SearchSolrAll
    */
@@ -58,7 +58,12 @@ class CustomSolrSearchResultBlock extends BlockBase implements ContainerFactoryP
    *   Custom Solr search service for all core.
    */
   public function __construct(
-  array $configuration, $plugin_id, $plugin_definition, Search $search, SolrServerDetails $serverDetails, SearchSolrAll $searchall
+  array $configuration,
+        $plugin_id,
+        $plugin_definition,
+        Search $search,
+        SolrServerDetails $serverDetails,
+        SearchSolrAll $searchall
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->search = $search;
@@ -114,7 +119,6 @@ class CustomSolrSearchResultBlock extends BlockBase implements ContainerFactoryP
       '#default_value' => isset($config['custom_solr_search_keyword_argument']) ? $config['custom_solr_search_keyword_argument'] : 0,
       '#description' => $this->t('Add the argument of search keyword to fetch the results.e.g. example.com/result/keyword if keyword is a argument then enter 2.'),
     ];
-
     return $form;
   }
 
@@ -168,7 +172,7 @@ class CustomSolrSearchResultBlock extends BlockBase implements ContainerFactoryP
             '#author' => $result->author_sort,
             '#publishDate' => implode(', ', $result->publishDate),
             '#publisher' => implode(', ', $result->publisher),
-            '#topic' => implode(', ', $result->topic)
+            '#topic' => implode(', ', $result->topic),
           );
 
           $result_items[] = render($result_item);
@@ -181,19 +185,14 @@ class CustomSolrSearchResultBlock extends BlockBase implements ContainerFactoryP
       '#cache' => array(
         'max-age' => 0,
       ),
-      '#empty' => t('No search results found!')
+      '#empty' => t('No search results found!'),
     );
 
     return $markup;
   }
 
   /**
-   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-   * @param array $configuration
-   * @param string $plugin_id
-   * @param mixed $plugin_definition
-   *
-   * @return array
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
diff --git a/src/Search.php b/src/Search.php
index 0cf5e9d..8b889c7 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -3,7 +3,6 @@
 namespace Drupal\custom_solr_search;
 
 use Solarium\QueryType\Select\Query\Query as SelectQuery;
-use Solarium\QueryType\Select\Query\FilterQuery as FilterTypeQuery;
 
 /**
  * Class Search.
diff --git a/src/SearchSolrAll.php b/src/SearchSolrAll.php
index 7c520ca..2bdcd06 100644
--- a/src/SearchSolrAll.php
+++ b/src/SearchSolrAll.php
@@ -1,19 +1,14 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\custom_solr_search\SearchSolrAll.
- */
-
 namespace Drupal\custom_solr_search;
 
-
 /**
  * Class SearchSolrAll.
  *
  * @package Drupal\custom_solr_search
  */
 class SearchSolrAll {
+
   /**
    * Constructor.
    */
@@ -29,7 +24,7 @@ class SearchSolrAll {
    * @param array $options
    *   Array for filter.
    *
-   * @return array $results
+   * @return results
    *   Array of search results.
    */
   public function seachAll($keyword, $options = NULL) {
diff --git a/src/Server.php b/src/Server.php
index c92a5f2..cb47751 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -38,5 +38,4 @@ class Server {
     return $solr;
   }
 
-
 }
diff --git a/src/SolrServerDetails.php b/src/SolrServerDetails.php
index 4c7cd84..cd83503 100644
--- a/src/SolrServerDetails.php
+++ b/src/SolrServerDetails.php
@@ -1,21 +1,16 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\custom_solr_search\SolrServerDetails.
- */
-
 namespace Drupal\custom_solr_search;
 
 use Drupal\Core\Database\Database;
 
-
 /**
  * Class SolrServerDetails.
  *
  * @package Drupal\custom_solr_search
  */
 class SolrServerDetails {
+
   /**
    * Constructor.
    */
@@ -26,18 +21,19 @@ class SolrServerDetails {
   /**
    * Get the saved server config entities.
    */
-   public function getServers(){
-     $connection = Database::getConnection();
-     $query = $connection->select('config', 'c')
-       ->fields('c', array('data'))
-       ->condition('c.name', '%search_api.server.%', 'LIKE');
-     $results = $query->execute();
-     $results = $results->fetchAll(\PDO::FETCH_OBJ);
-     $cores = [];
-     foreach ($results as $result) {
-       $server = unserialize($result->data);
-       $cores[$server['id']] = $server['name'];
-     }
-     return $cores;
-   }
+  public function getServers() {
+    $connection = Database::getConnection();
+    $query = $connection->select('config', 'c')
+      ->fields('c', array('data'))
+      ->condition('c.name', '%search_api.server.%', 'LIKE');
+    $results = $query->execute();
+    $results = $results->fetchAll(\PDO::FETCH_OBJ);
+    $cores = [];
+    foreach ($results as $result) {
+      $server = unserialize($result->data);
+      $cores[$server['id']] = $server['name'];
+    }
+    return $cores;
+  }
+
 }