diff --git a/src/Display/DisplayDeriverBase.php b/src/Display/DisplayDeriverBase.php
index ea246e6..1b9828d 100644
--- a/src/Display/DisplayDeriverBase.php
+++ b/src/Display/DisplayDeriverBase.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_api\Display\DisplayDeriverBase.
- */
-
 namespace Drupal\search_api\Display;
 
 use Drupal\Core\Entity\EntityTypeManager;
diff --git a/src/Display/DisplayInterface.php b/src/Display/DisplayInterface.php
index 8f34cd3..6f60a85 100644
--- a/src/Display/DisplayInterface.php
+++ b/src/Display/DisplayInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_api\Display\DisplayInterface.
- */
-
 namespace Drupal\search_api\Display;
 
 use Drupal\Component\Plugin\DerivativeInspectionInterface;
@@ -39,7 +34,7 @@ interface DisplayInterface extends PluginInspectionInterface, DerivativeInspecti
   /**
    * Returns the path used for this display.
    *
-   * @return string
+   * @return \Drupal\Core\Url
    *   The path of the display.
    */
   public function getPath();
diff --git a/src/Display/DisplayPluginBase.php b/src/Display/DisplayPluginBase.php
index 83214fe..444c7b2 100644
--- a/src/Display/DisplayPluginBase.php
+++ b/src/Display/DisplayPluginBase.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_api\Dispay\DisplayPluginBase.
- */
-
 namespace Drupal\search_api\Display;
 
 use Drupal\search_api\Plugin\IndexPluginBase;
@@ -16,15 +11,13 @@ use Drupal\search_api\Plugin\IndexPluginBase;
  * annotation. The definition includes the following keys:
  * - id: The unique, system-wide identifier of the display class.
  * - label: Human-readable name of the display class, translated.
- * - description: Human-readable description of the display class, translated.
  *
  * A complete plugin definition should be written as in this example:
  *
  * @code
  * @SearchApiDisplay(
  *   id = "my_display",
- *   label = @Translation("My display"),
- *   description = @Translation("This is the description for my display")
+ *   label = @Translation("My display")
  * )
  * @endcode
  *
diff --git a/src/Display/DisplayPluginManager.php b/src/Display/DisplayPluginManager.php
index 4cbed73..972d216 100644
--- a/src/Display/DisplayPluginManager.php
+++ b/src/Display/DisplayPluginManager.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_api\Display\DisplayPluginManager.
- */
-
 namespace Drupal\search_api\Display;
 
 use Drupal\Core\Cache\CacheBackendInterface;
@@ -53,7 +48,7 @@ class DisplayPluginManager extends DefaultPluginManager {
    *   An array of display plugins, keyed by type identifier.
    */
   public function getInstances() {
-    if (!isset($this->DataTypes)) {
+    if (!isset($this->displays)) {
       $this->displays = array();
 
       foreach ($this->getDefinitions() as $name => $display_definition) {
diff --git a/src/Plugin/search_api/display/ViewsPageDisplay.php b/src/Plugin/search_api/display/ViewsPageDisplay.php
index 7f58649..f7cf513 100644
--- a/src/Plugin/search_api/display/ViewsPageDisplay.php
+++ b/src/Plugin/search_api/display/ViewsPageDisplay.php
@@ -1,13 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_api\Plugin\search_api\display\ViewsPageDisplay.
- */
-
 namespace Drupal\search_api\Plugin\search_api\display;
 
 use Drupal\search_api\Display\DisplayPluginBase;
+use Drupal\views\Views;
 
 /**
  * Represents a display which represents the Search API views.
diff --git a/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php b/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php
index bf57332..1d3f65c 100644
--- a/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php
+++ b/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_api\Plugin\search_api\display\ViewsPageDisplayDeriver.
- */
-
 namespace Drupal\search_api\Plugin\search_api\display;
 
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
@@ -45,18 +40,25 @@ class ViewsPageDisplayDeriver extends DisplayDeriverBase {
             if ($display_info['display_plugin'] == "page") {
               $machine_name = $view->id() . PluginBase::DERIVATIVE_SEPARATOR . $name;
 
-              $plugin_derivatives[$machine_name] = [
-                  'id' => $base_plugin_id . PluginBase::DERIVATIVE_SEPARATOR . $machine_name,
-                  'label' => $this->t('View %view_label, display %display_title', ['%view_name' => $view->label(), '%display_title' => $display_info['display_title']]),
-                  'description' => $view->get('description') ? $this->t('%view_description - Represents the page display %display_title of view %view_name.', ['%view_name' => $view->label(), '%view_description' => $view->get('description'), '%display_title' => $display_info['display_title']]) : $this->t('Represents the page display %display_title of view %view_name.', ['%view_name' => $view->label(), '%display_title' => $display_info['display_title']]),
-                  'view_id' => $view->id(),
-                  'view_display' => $name,
-                ] + $base_plugin_definition;
+              $label_arguments = array(
+                '%view_name' => $view->label(),
+                '%display_title' => $display_info['display_title']
+              );
+              $label = $this->t('View %view_label, display %display_title', $label_arguments);
+
+              $plugin_derivatives[$machine_name] = array(
+                'id' => $base_plugin_id . PluginBase::DERIVATIVE_SEPARATOR . $machine_name,
+                'label' => $label,
+                'description' => $view->get('description') ? $this->t('%view_description - Represents the page display %display_title of view %view_name.', array('%view_name' => $view->label(), '%view_description' => $view->get('description'), '%display_title' => $display_info['display_title'])) : $this->t('Represents the page display %display_title of view %view_name.', array('%view_name' => $view->label(), '%display_title' => $display_info['display_title'])),
+                'view_id' => $view->id(),
+                'view_display' => $name,
+              ) + $base_plugin_definition;
 
-              $sources[] = $this->t(
-                'View name: %view. Display: %display',
-                ['%view' => $view->label(), '%display' => $display_info['display_title']]
+              $arguments = array(
+                '%view' => $view->label(),
+                '%display' => $display_info['display_title'],
               );
+              $sources[] = $this->t('View name: %view. Display: %display', $arguments);
             }
           }
         }