diff --git a/README.md b/README.md
index c4e4f6b..6bb2f74 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,13 @@ IIIF [Image API](http://iiif.io/api/image/2.0/) server
 
 Overview:
 --------
-Mirador is a multi-repository, configurable, extensible, and easy-to-integrate viewer and annotation creation and comparison environment for IIIF resources, ranging from deep-zooming artwork, to complex manuscript objects. It provides a tiling windowed environment for comparing multiple image-based resources, synchronised structural and visual navigation of content using openSeadragon, Open Annotation compliant annotation creation and viewing on deep-zoomable canvases, metadata display, bookreading, and bookmarking.
+Mirador is a multi-repository, configurable, extensible, and easy-to-integrate 
+viewer and annotation creation and comparison environment for IIIF resources, 
+ranging from deep-zooming artwork, to complex manuscript objects. It provides a 
+tiling windowed environment for comparing multiple image-based resources, 
+synchronised structural and visual navigation of content using openSeadragon, 
+Open Annotation compliant annotation creation and viewing on deep-zoomable 
+canvases, metadata display, bookreading, and bookmarking.
 
 * Mirador - https://github.com/IIIF/mirador
 
@@ -29,12 +35,15 @@ Installation:
 ------------
 1. Install the module as normal, see link for instructions.
    Link: https://www.drupal.org/documentation/install/modules-themes/modules-8
-2. Download compiled Mirador javascript library into Drupal's libraries directory, usually in`/libraries`. Verify the file permission is web servable. Make sure the path to the plugin is libraries/mirador/mirador.js.
-3. Set the IIIF image server in path /admin/config/media/mirador. In the image server specify the path upto files directory, in simple resolver config.
+2. Download compiled Mirador javascript library into Drupal's libraries 
+directory, usually in`/libraries`. Verify the file permission is web servable. 
+Make sure the path to the plugin is libraries/mirador/mirador.js.
+3. Set the IIIF image server in path /admin/config/media/mirador. 
+In the image server specify the path upto files directory, in simple resolver 
+config.
 
 
 Configuration:
 -------------
 Go to "Configuration" -> "Media" -> "Mirador" to find
 all the configuration options.
-
diff --git a/js/mirador-load.js b/js/mirador-load.js
index 1c65629..27a204e 100755
--- a/js/mirador-load.js
+++ b/js/mirador-load.js
@@ -10,21 +10,22 @@
       var manifestUri = settings.init.entity.manifest_uri;
       var viewerID = settings.init.entity.viewer_id;
       if ($('#' + viewerID + ' .mirador-viewer').length == 0) {
-        Mirador({
-          "id": viewerID,
-          "layout": "1x1",
-          'openManifestsPage' : false,
-          'showAddFromURLBox' : false,
-          "saveSession": false,
-          "data": [
-            { "manifestUri": manifestUri, "location": "National Virtual Library Of India"},
-          ],
-          "windowObjects":[{
-            "loadedManifest" : manifestUri,
-            "viewType" : "ImageView"} ],
-        });
+        Mirador(
+                {
+                  "id": viewerID,
+                  "layout": "1x1",
+                  'openManifestsPage': false,
+                  'showAddFromURLBox': false,
+                  "saveSession": false,
+                  "data": [
+                    {"manifestUri": manifestUri, "location": "National Virtual Library Of India"},
+                  ],
+                  "windowObjects": [{
+                      "loadedManifest": manifestUri,
+                      "viewType": "ImageView"}],
+                }
+        );
       }
     }
   };
 })(jQuery, Drupal);
-
diff --git a/mirador.inc b/mirador.inc
index d17cda5..85fa670 100755
--- a/mirador.inc
+++ b/mirador.inc
@@ -24,6 +24,7 @@ use Symfony\Component\Yaml\Parser;
  *   - settings: Formatter settings array.
  */
 function template_preprocess_mirador_formatter(&$variables) {
+
   $caption = NULL;
   global $base_url;
 
diff --git a/src/ActivationCheck.php b/src/ActivationCheck.php
index 685fc3b..a2c1dd4 100755
--- a/src/ActivationCheck.php
+++ b/src/ActivationCheck.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\mirador\ActivationCheck.
- */
-
 namespace Drupal\mirador;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -33,6 +28,7 @@ class ActivationCheck implements ActivationCheckInterface {
    * Create an instace of ActivationCheck.
    */
   public function __construct(ConfigFactoryInterface $config, RequestStack $request) {
+
     $this->settings = $config->get('mirador.settings');
     $this->request = $request->getCurrentRequest();
   }
@@ -41,6 +37,7 @@ class ActivationCheck implements ActivationCheckInterface {
    * {@inheritdoc}
    */
   public function isActive() {
+
     return $this->request->get('mirador') !== 'no';
   }
 
diff --git a/src/ActivationCheckInterface.php b/src/ActivationCheckInterface.php
index 7dcc562..15bbd21 100755
--- a/src/ActivationCheckInterface.php
+++ b/src/ActivationCheckInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Drupal\mirador\ActivationCheckInterface.
- */
-
 namespace Drupal\mirador;
 
 /**
diff --git a/src/Canvas.php b/src/Canvas.php
index 6ac8d04..c0ad08c 100644
--- a/src/Canvas.php
+++ b/src/Canvas.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains Mirador canvas creator.
- */
 
 namespace Drupal\mirador;
 
@@ -18,6 +14,7 @@ class Canvas {
    * Initiate the canvas.
    */
   public function __construct($id, $label) {
+
     $this->objectId = $id;
     $this->objectLabel = $label;
   }
@@ -26,6 +23,7 @@ class Canvas {
    * Add image to canvas.
    */
   public function setImage($thumbnail_uri, $image_uri, $resource_uri, $format, $width, $height) {
+
     $this->thumbnail_uri = $thumbnail_uri;
     $this->imageUri = $image_uri;
     $this->resource_uri = $resource_uri;
@@ -38,6 +36,7 @@ class Canvas {
    * Creates the manifest canvas array.
    */
   public function toArray() {
+
     $manifest_canvas = array(
       '@type' => 'sc:Canvas',
       '@id' => $this->objectId,
@@ -53,25 +52,25 @@ class Canvas {
         ),
       ),
       'images' => array(
-        array(
-          '@id' => $this->imageUri,
-          '@type' => 'oa:Annotation',
-          'motivation' => 'sc:Painting',
-          'on' => $this->objectId,
-          'resource' => array(
+      array(
+        '@id' => $this->imageUri,
+        '@type' => 'oa:Annotation',
+        'motivation' => 'sc:Painting',
+        'on' => $this->objectId,
+        'resource' => array(
+          '@id' => $this->resource_uri,
+          '@type' => 'dctypes:Image',
+          'format' => $this->imageFormat,
+          'height' => $this->imageHeight,
+          'width' => $this->imageWidth,
+          'service' => array(
+            '@context' => 'http://iiif.io/api/image/2/context.json',
             '@id' => $this->resource_uri,
-            '@type' => 'dctypes:Image',
-            'format' => $this->imageFormat,
-            'height' => $this->imageHeight,
-            'width' => $this->imageWidth,
-            'service' => array(
-              '@context' => 'http://iiif.io/api/image/2/context.json',
-              '@id' => $this->resource_uri,
-              'profile' => 'http://iiif.io/api/image/2/level2.json',
-            ),
+            'profile' => 'http://iiif.io/api/image/2/level2.json',
           ),
         ),
       ),
+      ),
     );
     return $manifest_canvas;
   }
diff --git a/src/Controller/MiradorManifestController.php b/src/Controller/MiradorManifestController.php
index e49a33b..28c8af2 100644
--- a/src/Controller/MiradorManifestController.php
+++ b/src/Controller/MiradorManifestController.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\mirdador\Controller\MiradorManifestController.
- */
-
 namespace Drupal\mirador\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
@@ -21,6 +16,7 @@ class MiradorManifestController extends ControllerBase {
    * Page callback: Returns manifest json.
    */
   public function getManifest($entity_type, $field_name, $entity_id, $settings) {
+
     // Set a default value for width and height, if none specified by the user.
     $width = $height = 4217;
     $attributes = $license = $logo = NULL;
diff --git a/src/ElementAttachmentInterface.php b/src/ElementAttachmentInterface.php
index d856c91..218a0ff 100755
--- a/src/ElementAttachmentInterface.php
+++ b/src/ElementAttachmentInterface.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * An interface for attaching things to the built page.
- */
 
 namespace Drupal\mirador;
 
diff --git a/src/Form/MiradorSettingsForm.php b/src/Form/MiradorSettingsForm.php
index b44ceaa..2f324f3 100755
--- a/src/Form/MiradorSettingsForm.php
+++ b/src/Form/MiradorSettingsForm.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @file
- * Administrative class form for the mirador module.
- *
- * Contains \Drupal\mirador\Form\MiradorSettingsForm.
- */
-
 namespace Drupal\mirador\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
@@ -21,6 +14,7 @@ class MiradorSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function getFormId() {
+
     return 'mirador_admin_settings_form';
   }
 
@@ -28,6 +22,7 @@ class MiradorSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   protected function getEditableConfigNames() {
+
     return ['mirador.settings'];
   }
 
@@ -35,6 +30,7 @@ class MiradorSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
+
     $config = $this->config('mirador.settings');
     $form['iiif_server'] = array(
       '#type' => 'textfield',
@@ -50,9 +46,10 @@ class MiradorSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
+
     $this->config('mirador.settings')
-      ->set('iiif_server', $form_state->getValue('iiif_server'))
-      ->save();
+            ->set('iiif_server', $form_state->getValue('iiif_server'))
+            ->save();
 
     parent::submitForm($form, $form_state);
   }
@@ -61,6 +58,7 @@ class MiradorSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
+
   }
 
 }
diff --git a/src/MiradorAttachment.php b/src/MiradorAttachment.php
index aba272c..5f8585f 100755
--- a/src/MiradorAttachment.php
+++ b/src/MiradorAttachment.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\mirador\PageAttachmentInterface.
- */
-
 namespace Drupal\mirador;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -39,6 +34,7 @@ class MiradorAttachment implements ElementAttachmentInterface {
    * Create an instance of MiradorAttachment.
    */
   public function __construct(ActivationCheckInterface $activation, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config) {
+
     $this->activation = $activation;
     $this->moduleHandler = $module_handler;
     $this->settings = $config->get('mirador.settings');
@@ -48,6 +44,7 @@ class MiradorAttachment implements ElementAttachmentInterface {
    * {@inheritdoc}
    */
   public function isApplicable() {
+
     return !drupal_installation_attempted() && $this->activation->isActive();
   }
 
@@ -55,6 +52,7 @@ class MiradorAttachment implements ElementAttachmentInterface {
    * {@inheritdoc}
    */
   public function attach(array &$page) {
+
     $page['#attached']['library'][] = 'mirador/mirador';
     $page['#attached']['library'][] = 'mirador/init';
   }
diff --git a/src/Plugin/Field/FieldFormatter/MiradorFormatter.php b/src/Plugin/Field/FieldFormatter/MiradorFormatter.php
index 1df1b50..e9affaa 100755
--- a/src/Plugin/Field/FieldFormatter/MiradorFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/MiradorFormatter.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\mirador\Plugin\Field\FieldFormatter\MiradorFormatter.
- */
-
 namespace Drupal\mirador\Plugin\Field\FieldFormatter;
 
 use Drupal\mirador\ElementAttachmentInterface;
@@ -17,7 +12,6 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatterBase;
 
-
 /**
  * Plugin implementation of the 'mirador' formatter.
  *
@@ -59,6 +53,7 @@ class MiradorFormatter extends ImageFormatterBase implements ContainerFactoryPlu
    *   Allow the library to be attached to the page.
    */
   public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityStorageInterface $image_style_storage, ElementAttachmentInterface $attachment) {
+
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
     $this->imageStyleStorage = $image_style_storage;
     $this->attachment = $attachment;
@@ -68,6 +63,7 @@ class MiradorFormatter extends ImageFormatterBase implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+
     return new static(
       $plugin_id,
       $plugin_definition,
@@ -78,13 +74,14 @@ class MiradorFormatter extends ImageFormatterBase implements ContainerFactoryPlu
       $configuration['third_party_settings'],
       $container->get('entity.manager')->getStorage('image_style'),
       $container->get('mirador.attachment')
-    );
+      );
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultSettings() {
+
     return array(
       'mirador_node_style' => '',
       'mirador_settings' => '',
@@ -95,6 +92,7 @@ class MiradorFormatter extends ImageFormatterBase implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
+
     $image_styles = image_style_options(FALSE);
     $image_styles_hide = $image_styles;
     $image_styles_hide['hide'] = t('Hide (do not display image)');
@@ -111,14 +109,16 @@ class MiradorFormatter extends ImageFormatterBase implements ContainerFactoryPlu
       '#title' => t('Mirador Settings'),
       '#type' => 'textarea',
       '#default_value' => $this->getSetting('mirador_settings'),
-      '#description' => t('Please enter the mirador settings in YAML Format, ie key: field_machine_name.
+      '#description' => t(
+          'Please enter the mirador settings in YAML Format, ie key: field_machine_name.
         allowed key values are: label, description, width, height, attribution, author, rights.
         <br>
         Eg: <pre>
           label: title
           description: body
           attribution: title
-         </pre>'),
+         </pre>'
+      ),
     );
     return $element;
   }
@@ -127,6 +127,7 @@ class MiradorFormatter extends ImageFormatterBase implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public function settingsSummary() {
+
     $summary = array();
     $image_styles = image_style_options(FALSE);
     // Unset possible 'No defined styles' option.
@@ -153,6 +154,7 @@ class MiradorFormatter extends ImageFormatterBase implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
+
     $elements = array();
     $settings = $this->getSettings();
     $files = $this->getEntitiesToView($items, $langcode);
diff --git a/src/SharedCanvasManifest.php b/src/SharedCanvasManifest.php
index dd1c6dc..cf030ed 100644
--- a/src/SharedCanvasManifest.php
+++ b/src/SharedCanvasManifest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains Mirador manifest creator.
- */
 
 namespace Drupal\mirador;
 
@@ -19,6 +15,7 @@ class SharedCanvasManifest {
    * Initiate the manifest.
    */
   public function __construct($id, $label, $description, $attributes, $license, $logo, $metadata) {
+
     $this->id = $id;
     $this->objectLabel = $label;
     $this->description = $description;
@@ -32,6 +29,7 @@ class SharedCanvasManifest {
    * Add a $canvas to $sequences.
    */
   public function addCanvas($canvas = NULL) {
+
     if ($canvas != NULL) {
       $this->canvases[] = $canvas->toArray();
     }
@@ -41,6 +39,7 @@ class SharedCanvasManifest {
    * Build and return a json string based on what we have in the class.
    */
   public function getManifest() {
+
     $sc_manifest = array(
       '@context' => 'http://iiif.io/api/presentation/2/context.json',
       '@id' => $this->id,
@@ -52,12 +51,12 @@ class SharedCanvasManifest {
       'logo' => $this->logo,
       'metadata' => $this->metadata,
       'sequences' => array(
-        array(
-          '@type' => 'sc:Sequence',
-          'id' => $this->id,
-          'label' => $this->object_label . ', in order',
-          'canvases' => $this->canvases,
-        ),
+      array(
+        '@type' => 'sc:Sequence',
+        'id' => $this->id,
+        'label' => $this->object_label . ', in order',
+        'canvases' => $this->canvases,
+      ),
       ),
     );
     return $sc_manifest;