diff --git a/includes/cloudinary.transformation.cloudinary.inc b/includes/cloudinary.transformation.cloudinary.inc
index e30def9..e0b43da 100644
--- a/includes/cloudinary.transformation.cloudinary.inc
+++ b/includes/cloudinary.transformation.cloudinary.inc
@@ -8,32 +8,31 @@
 /**
  * Convert image effect cloudinary_crop to cloudinary style.
  */
-function cloudinary_transformation_cloudinary_crop($effect, $exist_effect, $resource)
-{
-    $data = cloudinary_prepare_transformation($effect['data'], false);
-    /**
-     * We check to see if a crop value has been set in the effect array and if so we set it to the $crop variable.
-     */
-    if ($effect['data']['crop'] != null) {
-        $crop = $effect['data']['crop'];
-    } else {
-        $crop = null;
+function cloudinary_transformation_cloudinary_crop($effect, $exist_effect, $resource) {
+  $data = cloudinary_prepare_transformation($effect['data'], FALSE);
+  /**
+   * We check to see if a crop value has been set in the effect array and if so we set it to the $crop variable.
+   */
+  if ($effect['data']['crop'] != NULL) {
+    $crop = $effect['data']['crop'];
+  }
+  else {
+    $crop = NULL;
+  }
+  if (isset($data['multiple'])) {
+    unset($data['multiple']);
+    $new_data = ['type' => CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_MULTIPLE, 'data' => []];
+    foreach ($data as $d) {
+      $new_data['data'][] = cloudinary_transformation_image($d);
     }
-    if (isset($data['multiple'])) {
-        unset($data['multiple']);
-        $new_data = array('type' => CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_MULTIPLE, 'data' => array());
-        foreach ($data as $d) {
-            $new_data['data'][] = cloudinary_transformation_image($d);
-        }
-        return $new_data;
-    }
-    return cloudinary_transformation_image($data, $crop);
+    return $new_data;
+  }
+  return cloudinary_transformation_image($data, $crop);
 }
 
 /**
  * Apply named transformation to an image.
  */
-function cloudinary_transformation_cloudinary_named_transformation($effect, $exist_effect, $resource)
-{
+function cloudinary_transformation_cloudinary_named_transformation($effect, $exist_effect, $resource) {
   return cloudinary_transformation_image($effect['data']);
 }
diff --git a/includes/cloudinary.transformation.drupal.inc b/includes/cloudinary.transformation.drupal.inc
index 5cb902c..2b7adc7 100644
--- a/includes/cloudinary.transformation.drupal.inc
+++ b/includes/cloudinary.transformation.drupal.inc
@@ -8,120 +8,117 @@
 /**
  * Convert image effect image_crop to cloudinary style.
  */
-function cloudinary_transformation_image_crop($effect, $exist_effect, $resource)
-{
-    $search = array(
-        'left-top',
-        'center-top',
-        'right-top',
-        'left-center',
-        'center-center',
-        'right-center',
-        'left-bottom',
-        'center-bottom',
-        'right-bottom',
-    );
-    $replace = array(
-        'north_west',
-        'north',
-        'north_east',
-        'west',
-        'center',
-        'east',
-        'south_west',
-        'south',
-        'south_east',
-    );
-    $anchor = str_replace($search, $replace, $effect['data']['anchor']);
-    $effect['data']['gravity'] = $anchor;
-    unset($effect['data']['anchor']);
-    // Default with crop.
-    $crop = 'crop';
-    // Assign destination & original size.
-    $dst_width = $effect['data']['width'];
-    $dst_height = $effect['data']['height'];
-    $src_width = $resource['width'];
-    $src_height = $resource['height'];
-    // Init crop data.
-    $crop_data = array();
-    // Set image background with black.
-    $effect['data']['background'] = '#000';
-    // If destination width & height large than original, mpad.
-    if ($dst_width > $src_width && $dst_height > $src_height) {
-        $crop = 'mpad';
-    }
-    // If destination width large, height small;
-    // Crop with original width & destination height;
-    elseif ($dst_width > $src_width && $dst_height <= $src_height) {
-        $crop_data = array('width' => $src_width, 'height' => $dst_height);
-    }
-    // If destination width small, height large;
-    // Crop with destination width & original height;
-    elseif ($dst_width <= $src_width && $dst_height > $src_height) {
-        $crop_data = array('width' => $dst_width, 'height' => $src_height);
-    }
-    // Unset background attribute.
-    else {
-        unset($effect['data']['background']);
-    }
-    // Add crop mode first if have crop data;
-    // Add pad mode with destination size and black background.
-    if (!empty($crop_data)) {
-        $data = array(
-            'type' => CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_MULTIPLE,
-            'data' => array(
-                cloudinary_transformation_image($crop_data, array('crop' => 'crop')),
-                cloudinary_transformation_image($effect['data'], array('crop' => 'pad')),
-            ),
-        );
+function cloudinary_transformation_image_crop($effect, $exist_effect, $resource) {
+  $search = [
+    'left-top',
+    'center-top',
+    'right-top',
+    'left-center',
+    'center-center',
+    'right-center',
+    'left-bottom',
+    'center-bottom',
+    'right-bottom',
+  ];
+  $replace = [
+    'north_west',
+    'north',
+    'north_east',
+    'west',
+    'center',
+    'east',
+    'south_west',
+    'south',
+    'south_east',
+  ];
+  $anchor = str_replace($search, $replace, $effect['data']['anchor']);
+  $effect['data']['gravity'] = $anchor;
+  unset($effect['data']['anchor']);
+  // Default with crop.
+  $crop = 'crop';
+  // Assign destination & original size.
+  $dst_width = $effect['data']['width'];
+  $dst_height = $effect['data']['height'];
+  $src_width = $resource['width'];
+  $src_height = $resource['height'];
+  // Init crop data.
+  $crop_data = [];
+  // Set image background with black.
+  $effect['data']['background'] = '#000';
+  // If destination width & height large than original, mpad.
+  if ($dst_width > $src_width && $dst_height > $src_height) {
+    $crop = 'mpad';
+  }
+  // If destination width large, height small;
+  // Crop with original width & destination height;.
+  elseif ($dst_width > $src_width && $dst_height <= $src_height) {
+    $crop_data = ['width' => $src_width, 'height' => $dst_height];
+  }
+  // If destination width small, height large;
+  // Crop with destination width & original height;.
+  elseif ($dst_width <= $src_width && $dst_height > $src_height) {
+    $crop_data = ['width' => $dst_width, 'height' => $src_height];
+  }
+  // Unset background attribute.
+  else {
+    unset($effect['data']['background']);
+  }
+  // Add crop mode first if have crop data;
+  // Add pad mode with destination size and black background.
+  if (!empty($crop_data)) {
+    $data = [
+      'type' => CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_MULTIPLE,
+      'data' => [
+        cloudinary_transformation_image($crop_data, ['crop' => 'crop']),
+        cloudinary_transformation_image($effect['data'], ['crop' => 'pad']),
+      ],
+    ];
 
-        return $data;
-    }
+    return $data;
+  }
 
-    return cloudinary_transformation_image($effect['data'], array('crop' => $crop));
+  return cloudinary_transformation_image($effect['data'], ['crop' => $crop]);
 }
 
 /**
  * Convert image effect image_desaturate to cloudinary style.
  */
-function cloudinary_transformation_image_desaturate($effect, $exist_effect, $resource)
-{
-    if (!isset($exist_effect['effect'])) {
-        $effect['data']['type'] = CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_APPEND;
-    } elseif ($exist_effect['effect'] == 'grayscale') {
-        return false;
-    }
+function cloudinary_transformation_image_desaturate($effect, $exist_effect, $resource) {
+  if (!isset($exist_effect['effect'])) {
+    $effect['data']['type'] = CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_APPEND;
+  }
+  elseif ($exist_effect['effect'] == 'grayscale') {
+    return FALSE;
+  }
 
-    return cloudinary_transformation_image($effect['data'], array('effect' => 'grayscale'));
+  return cloudinary_transformation_image($effect['data'], ['effect' => 'grayscale']);
 }
 
 /**
  * Convert image effect image_resize to cloudinary style.
  */
-function cloudinary_transformation_image_resize($effect, $exist_effect, $resource)
-{
-    return cloudinary_transformation_image($effect['data'], 'scale');
+function cloudinary_transformation_image_resize($effect, $exist_effect, $resource) {
+  return cloudinary_transformation_image($effect['data'], 'scale');
 }
 
 /**
  * Convert image effect image_rotate to cloudinary style.
  */
-function cloudinary_transformation_image_rotate($effect, $exist_effect, $resource)
-{
-    if (!isset($exist_effect['crop']) && !isset($exist_effect['angle'])) {
-        $effect['data']['type'] = CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_APPEND;
-    }
+function cloudinary_transformation_image_rotate($effect, $exist_effect, $resource) {
+  if (!isset($exist_effect['crop']) && !isset($exist_effect['angle'])) {
+    $effect['data']['type'] = CLOUDINARY_STREAM_WRAPPER_TRANSFORMATION_APPEND;
+  }
 
-    $degrees = $effect['data']['degrees'];
-    if (!empty($effect['data']['random'])) {
-        $degrees = abs((float) $degrees);
-        $degrees = rand(-1 * $degrees, $degrees);
-    }
-    $effect['data']['angle'] = $degrees;
-    // Unset unused values.
-    unset($effect['data']['degrees'], $effect['data']['random']);
+  $degrees = $effect['data']['degrees'];
+  if (!empty($effect['data']['random'])) {
+    $degrees = abs((float) $degrees);
+    $degrees = rand(-1 * $degrees, $degrees);
+  }
+  $effect['data']['angle'] = $degrees;
+  // Unset unused values.
+  unset($effect['data']['degrees'], $effect['data']['random']);
 
-    return cloudinary_transformation_image($effect['data']);
+  return cloudinary_transformation_image($effect['data']);
 }
 
 /**
@@ -144,7 +141,6 @@ function cloudinary_transformation_image_scale($effect, $exist_effect, $resource
 /**
  * Convert image effect image_scale_and_crop to cloudinary style.
  */
-function cloudinary_transformation_image_scale_and_crop($effect, $exist_effect, $resource)
-{
-    return cloudinary_transformation_image($effect['data'], 'fill');
+function cloudinary_transformation_image_scale_and_crop($effect, $exist_effect, $resource) {
+  return cloudinary_transformation_image($effect['data'], 'fill');
 }
diff --git a/modules/cloudinary_media_library_widget/src/Model/Asset.php b/modules/cloudinary_media_library_widget/src/Model/Asset.php
index a2427fd..0e288e1 100644
--- a/modules/cloudinary_media_library_widget/src/Model/Asset.php
+++ b/modules/cloudinary_media_library_widget/src/Model/Asset.php
@@ -80,9 +80,9 @@ class Asset {
   protected $bytes;
 
   /**
-   * Duration
+   * Duration.
    *
-   * @var int|NULL
+   * @var int|null
    */
   protected $duration;
 
@@ -117,21 +117,21 @@ class Asset {
   /**
    * Created by.
    *
-   * @var string|NULL
+   * @var string|null
    */
   protected $created_by;
 
   /**
    * Uploaded by.
    *
-   * @var string|NULL
+   * @var string|null
    */
   protected $uploaded_by;
 
   /**
    * Custom context.
    *
-   * @var Custom|NULL
+   * @var \Drupal\cloudinary_media_library_widget\Model\Context\Custom|null
    */
   protected $denormalizedCustom = NULL;
 
diff --git a/modules/cloudinary_media_library_widget/src/Model/Context/Custom.php b/modules/cloudinary_media_library_widget/src/Model/Context/Custom.php
index d5b1ff0..aeda684 100644
--- a/modules/cloudinary_media_library_widget/src/Model/Context/Custom.php
+++ b/modules/cloudinary_media_library_widget/src/Model/Context/Custom.php
@@ -10,14 +10,14 @@ class Custom {
   /**
    * Description (alt)
    *
-   * @var string|NULL
+   * @var string|null
    */
   protected $alt = NULL;
 
   /**
    * Title (caption).
    *
-   * @var string|NULL
+   * @var string|null
    */
   protected $caption = NULL;
 
diff --git a/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php b/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php
index cbc0c17..6040d7c 100644
--- a/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php
+++ b/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php
@@ -62,4 +62,3 @@ class AssetNormalizer extends PropertyNormalizer {
   }
 
 }
-
diff --git a/modules/cloudinary_sdk/cloudinary_sdk.install b/modules/cloudinary_sdk/cloudinary_sdk.install
index e6be647..b7c2a37 100644
--- a/modules/cloudinary_sdk/cloudinary_sdk.install
+++ b/modules/cloudinary_sdk/cloudinary_sdk.install
@@ -26,7 +26,7 @@ function cloudinary_sdk_requirements($phase) {
     return $requirements;
   }
 
-  list($status, $version, $error_message) = cloudinary_sdk_check(TRUE);
+  [$status, $version, $error_message] = cloudinary_sdk_check(TRUE);
   $r = [
     'severity' => REQUIREMENT_OK,
     'title' => t('Cloudinary'),
diff --git a/modules/cloudinary_sdk/cloudinary_sdk.module b/modules/cloudinary_sdk/cloudinary_sdk.module
index cd81269..2c8c353 100644
--- a/modules/cloudinary_sdk/cloudinary_sdk.module
+++ b/modules/cloudinary_sdk/cloudinary_sdk.module
@@ -114,7 +114,6 @@ function cloudinary_sdk_help($route_name) {
   ];
   $api_image = $renderer->render($api);
 
-
   $output = '';
   $url = Url::fromUri('http://www.cloudinary.com/');
   $url_console = Url::fromUri('http://www.cloudinary.com/console');
diff --git a/modules/cloudinary_sdk/src/CloudinarySdkConstantsInterface.php b/modules/cloudinary_sdk/src/CloudinarySdkConstantsInterface.php
index cbb0736..8183edb 100644
--- a/modules/cloudinary_sdk/src/CloudinarySdkConstantsInterface.php
+++ b/modules/cloudinary_sdk/src/CloudinarySdkConstantsInterface.php
@@ -26,4 +26,5 @@ interface CloudinarySdkConstantsInterface {
    * Flag for dealing with "CLOUDINARY SDK for PHP" loaded.
    */
   const CLOUDINARY_SDK_LOADED = 2;
+
 }
diff --git a/modules/cloudinary_storage/cloudinary_storage.api.php b/modules/cloudinary_storage/cloudinary_storage.api.php
index f6d5821..e28cb59 100644
--- a/modules/cloudinary_storage/cloudinary_storage.api.php
+++ b/modules/cloudinary_storage/cloudinary_storage.api.php
@@ -14,12 +14,12 @@
  *   more detial see exist cloudinary storage sub modules.
  */
 function hook_cloudinary_storage_info() {
-  return array(
-    'cloudinary_storage_name' => array(
+  return [
+    'cloudinary_storage_name' => [
       'title' => t('Name'),
       'class' => 'CloudinaryStorageName',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/modules/cloudinary_storage/cloudinary_storage.module b/modules/cloudinary_storage/cloudinary_storage.module
index 6d7a914..2b4dd33 100644
--- a/modules/cloudinary_storage/cloudinary_storage.module
+++ b/modules/cloudinary_storage/cloudinary_storage.module
@@ -1,5 +1,4 @@
 <?php
-use Drupal\Core\Form\FormStateInterface;
 
 /**
  * @file
@@ -60,8 +59,8 @@ function cloudinary_storage_cloudinary_stream_wrapper_resource_create($resource)
   if (isset($resource['public_id'])) {
     if ($storage_class = cloudinary_storage_class()) {
       $storage = new $storage_class($resource);
-      list($path, $file) = $storage->resourceUpdate();
-      $data = array(CLOUDINARY_STORAGE_NEW => $file);
+      [$path, $file] = $storage->resourceUpdate();
+      $data = [CLOUDINARY_STORAGE_NEW => $file];
 
       if ($resource['mode'] == CLOUDINARY_STREAM_WRAPPER_FILE) {
         $storage->folderUpdate($path, $data);
@@ -82,21 +81,21 @@ function cloudinary_storage_cloudinary_stream_wrapper_resource_rename($src_resou
     $src_file = $dst_file = '';
 
     $src_storage = new $storage_class($src_resource);
-    list($src_path, $src_file) = $src_storage->resourceUpdate(FALSE);
+    [$src_path, $src_file] = $src_storage->resourceUpdate(FALSE);
 
     $dst_storage = new $storage_class($dst_resource);
-    list($dst_path, $dst_file) = $dst_storage->resourceUpdate();
+    [$dst_path, $dst_file] = $dst_storage->resourceUpdate();
 
     if ($src_path !== FALSE && $src_path == $dst_path) {
-      $src_storage->folderUpdate($src_path, array(CLOUDINARY_STORAGE_NEW => $dst_file, CLOUDINARY_STORAGE_REMOVE => $src_file));
+      $src_storage->folderUpdate($src_path, [CLOUDINARY_STORAGE_NEW => $dst_file, CLOUDINARY_STORAGE_REMOVE => $src_file]);
     }
     else {
       if ($src_path !== FALSE) {
-        $src_storage->folderUpdate($src_path, array(CLOUDINARY_STORAGE_REMOVE => $src_file));
+        $src_storage->folderUpdate($src_path, [CLOUDINARY_STORAGE_REMOVE => $src_file]);
       }
 
       if ($dst_path !== FALSE) {
-        $dst_storage->folderUpdate($dst_path, array(CLOUDINARY_STORAGE_NEW => $dst_file));
+        $dst_storage->folderUpdate($dst_path, [CLOUDINARY_STORAGE_NEW => $dst_file]);
       }
     }
   }
@@ -135,10 +134,10 @@ function cloudinary_storage_cloudinary_stream_wrapper_resource_delete($resource)
   if (isset($resource['public_id'])) {
     if ($storage_class = cloudinary_storage_class()) {
       $storage = new $storage_class($resource);
-      list($path, $file) = $storage->resourceUpdate(FALSE);
+      [$path, $file] = $storage->resourceUpdate(FALSE);
 
       if ($resource['mode'] == CLOUDINARY_STREAM_WRAPPER_FILE) {
-        $storage->folderUpdate($path, array(CLOUDINARY_STORAGE_REMOVE => $file));
+        $storage->folderUpdate($path, [CLOUDINARY_STORAGE_REMOVE => $file]);
       }
     }
   }
@@ -168,25 +167,25 @@ function cloudinary_storage_form_cloudinary_sdk_settings_alter(&$form, $form_sta
     return;
   }
 
-  $options = array();
+  $options = [];
   foreach ($storages as $key => $storage) {
     $options[$key] = $storage['title'];
   }
 
-  $form['storage'] = array(
+  $form['storage'] = [
     '#type' => 'fieldset',
     '#title' => t('Cloudinary storage settings'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#description' => t('Choose one of the storage to reduce network requests and improve loading speed for uploaded Cloudinary files.'),
-  );
+  ];
 
-  $form['storage']['cloudinary_storage_default'] = array(
+  $form['storage']['cloudinary_storage_default'] = [
     '#type' => 'radios',
     '#title' => t('Storage for uploaded cloudinary files'),
     '#options' => $options,
     '#default_value' => \Drupal::config('cloudinary_storage.settings')->get('cloudinary_storage_default'),
-  );
+  ];
 
   // Unshfit exist storage clear checking.
   array_unshift($form['#submit'], 'cloudinary_storage_settings_submit');
diff --git a/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.install b/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.install
index bbf6442..a4f03b0 100644
--- a/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.install
+++ b/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.install
@@ -18,32 +18,32 @@ function cloudinary_storage_db_disable() {
  * Implements hook_schema().
  */
 function cloudinary_storage_db_schema() {
-  $schema['cloudinary_storage'] = array(
+  $schema['cloudinary_storage'] = [
     'description' => 'Stores information for uploaded Cloudinary files.',
-    'fields' => array(
-      'public_id' => array(
+    'fields' => [
+      'public_id' => [
         'description' => 'The public_id of Cloudinary file.',
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'mode' => array(
+      ],
+      'mode' => [
         'description' => 'The file mode, file or directory.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'metadata' => array(
+      ],
+      'metadata' => [
         'description' => 'The file metadata.',
         'type' => 'text',
         'serialize' => TRUE,
         'not null' => FALSE,
-      ),
-    ),
+      ],
+    ],
     'primary key' => ['public_id'],
-  );
+  ];
 
   return $schema;
 }
diff --git a/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.module b/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.module
index 7b83142..0e3e668 100644
--- a/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.module
+++ b/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.module
@@ -5,16 +5,14 @@
  * File for the cloudinary_storage_db module.
  */
 
-use Drupal\cloudinary_storage_db\CloudinaryStorageDb;
-
 /**
  * Implements hook_cloudinary_storage_info().
  */
 function cloudinary_storage_db_cloudinary_storage_info() {
-  return array(
-    'cloudinary_storage_db' => array(
+  return [
+    'cloudinary_storage_db' => [
       'title' => t('Database'),
       'class' => '\Drupal\cloudinary_storage_db\CloudinaryStorageDb',
-    ),
-  );
+    ],
+  ];
 }
diff --git a/modules/cloudinary_storage/modules/cloudinary_storage_db/src/CloudinaryStorageDb.php b/modules/cloudinary_storage/modules/cloudinary_storage_db/src/CloudinaryStorageDb.php
index 40e0eeb..36104a0 100644
--- a/modules/cloudinary_storage/modules/cloudinary_storage_db/src/CloudinaryStorageDb.php
+++ b/modules/cloudinary_storage/modules/cloudinary_storage_db/src/CloudinaryStorageDb.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drupal\cloudinary_storage_db;
 
 use Drupal\cloudinary_storage\CloudinaryStorage;
@@ -12,19 +13,20 @@ use Drupal\cloudinary_storage\CloudinaryStorage;
  * Implements cloudinary storage with database.
  */
 class CloudinaryStorageDb extends CloudinaryStorage {
+
   /**
    * Create or update cloudinary file resource into db.
    */
-  protected function save($resource = array()) {
+  protected function save($resource = []) {
     if (isset($resource['public_id']) && !empty($resource['mode'])) {
-      $data = array(
+      $data = [
         'public_id' => $resource['public_id'],
         'mode' => $resource['mode'],
         'metadata' => serialize($resource),
-      );
+      ];
 
       \Drupal::database()->merge('cloudinary_storage')
-        ->key(array('public_id' => $data['public_id']))
+        ->key(['public_id' => $data['public_id']])
         ->fields($data)
         ->execute();
     }
@@ -34,7 +36,7 @@ class CloudinaryStorageDb extends CloudinaryStorage {
    * Delete cloudinary file resource from db.
    */
   protected function delete($public_id) {
-    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // @todo Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
     // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
     \Drupal::database()->delete('cloudinary_storage')
       ->condition('public_id', $public_id)
@@ -47,7 +49,7 @@ class CloudinaryStorageDb extends CloudinaryStorage {
   protected function deleteFolder($public_id) {
     // Only remove file and folder resource in this folder.
     // Cloudinary can not delete folder, parent folder update is not necessary.
-    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // @todo Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
     // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
     \Drupal::database()->delete('cloudinary_storage')
       ->condition('public_id', db_like($public_id) . '%', 'LIKE')
@@ -58,9 +60,9 @@ class CloudinaryStorageDb extends CloudinaryStorage {
    * Load cloudinary file resource from db.
    */
   protected function load($public_id) {
-    $resource = array();
+    $resource = [];
 
-    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // @todo Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
     // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
     $result = \Drupal::database()->select('cloudinary_storage', 'cs')
       ->fields('cs')
@@ -80,7 +82,7 @@ class CloudinaryStorageDb extends CloudinaryStorage {
    * Clear all resources data from db.
    */
   public function clear() {
-    // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+    // @todo Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
     // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
     \Drupal::database()->query('TRUNCATE {cloudinary_storage}');
   }
diff --git a/modules/cloudinary_storage/src/CloudinaryStorage.php b/modules/cloudinary_storage/src/CloudinaryStorage.php
index 2e25796..d0d2acb 100644
--- a/modules/cloudinary_storage/src/CloudinaryStorage.php
+++ b/modules/cloudinary_storage/src/CloudinaryStorage.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Drupal\cloudinary_storage;
 
 /**
@@ -8,7 +9,7 @@ abstract class CloudinaryStorage {
   /**
    * A current file resource of Cloudinary.
    *
-   * @var Array
+   * @var array
    */
   protected $resource = NULL;
 
@@ -61,9 +62,9 @@ abstract class CloudinaryStorage {
   /**
    * Preprae file or folder resource for folder update.
    */
-  static protected function prepareFolderData($data, $update) {
+  protected static function prepareFolderData($data, $update) {
     if (empty($data) || !is_array($data)) {
-      $data = array();
+      $data = [];
     }
 
     // Append new file or folder if not exist.
@@ -91,7 +92,7 @@ abstract class CloudinaryStorage {
   /**
    * Update child files or folders in folder resource.
    */
-  public function folderUpdate($path, $file = array(), $folder = array()) {
+  public function folderUpdate($path, $file = [], $folder = []) {
     if ($path === FALSE) {
       return;
     }
@@ -154,7 +155,7 @@ abstract class CloudinaryStorage {
       }
     }
 
-    return array($path, $file);
+    return [$path, $file];
   }
 
 }
diff --git a/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.api.php b/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.api.php
index 34629cc..493f889 100644
--- a/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.api.php
+++ b/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.api.php
@@ -18,8 +18,8 @@ function hook_cloudinary_stream_wrapper_resource_create(array $resource) {
   if (isset($resource['public_id'])) {
     if ($storage_class = cloudinary_storage_class()) {
       $storage = new $storage_class($resource);
-      list($path, $file) = $storage->resourceUpdate();
-      $data = array(CLOUDINARY_STORAGE_NEW => $file);
+      [$path, $file] = $storage->resourceUpdate();
+      $data = [CLOUDINARY_STORAGE_NEW => $file];
 
       if ($resource['mode'] == CLOUDINARY_STREAM_WRAPPER_FILE) {
         $storage->folderUpdate($path, $data);
@@ -47,21 +47,21 @@ function hook_cloudinary_stream_wrapper_resource_rename(array $src_resource, arr
     $src_file = $dst_file = '';
 
     $src_storage = new $storage_class($src_resource);
-    list($src_path, $src_file) = $src_storage->resourceUpdate(FALSE);
+    [$src_path, $src_file] = $src_storage->resourceUpdate(FALSE);
 
     $dst_storage = new $storage_class($dst_resource);
-    list($dst_path, $dst_file) = $dst_storage->resourceUpdate();
+    [$dst_path, $dst_file] = $dst_storage->resourceUpdate();
 
     if ($src_path !== FALSE && $src_path == $dst_path) {
-      $src_storage->folderUpdate($src_path, array(CLOUDINARY_STORAGE_NEW => $dst_file, CLOUDINARY_STORAGE_REMOVE => $src_file));
+      $src_storage->folderUpdate($src_path, [CLOUDINARY_STORAGE_NEW => $dst_file, CLOUDINARY_STORAGE_REMOVE => $src_file]);
     }
     else {
       if ($src_path !== FALSE) {
-        $src_storage->folderUpdate($src_path, array(CLOUDINARY_STORAGE_REMOVE => $src_file));
+        $src_storage->folderUpdate($src_path, [CLOUDINARY_STORAGE_REMOVE => $src_file]);
       }
 
       if ($dst_path !== FALSE) {
-        $dst_storage->folderUpdate($dst_path, array(CLOUDINARY_STORAGE_NEW => $dst_file));
+        $dst_storage->folderUpdate($dst_path, [CLOUDINARY_STORAGE_NEW => $dst_file]);
       }
     }
   }
@@ -118,10 +118,10 @@ function hook_cloudinary_stream_wrapper_resource_delete(array $resource) {
   if (isset($resource['public_id'])) {
     if ($storage_class = cloudinary_storage_class()) {
       $storage = new $storage_class($resource);
-      list($path, $file) = $storage->resourceUpdate(FALSE);
+      [$path, $file] = $storage->resourceUpdate(FALSE);
 
       if ($resource['mode'] == CLOUDINARY_STREAM_WRAPPER_FILE) {
-        $storage->folderUpdate($path, array(CLOUDINARY_STORAGE_REMOVE => $file));
+        $storage->folderUpdate($path, [CLOUDINARY_STORAGE_REMOVE => $file]);
       }
     }
   }
@@ -142,13 +142,13 @@ function hook_cloudinary_stream_wrapper_resource_delete(array $resource) {
 function hook_cloudinary_stream_wrapper_transformation() {
   $path = \Drupal::service('extension.list.module')->getPath('cloudinary');
 
-  return array(
-    'image_crop' => array(
+  return [
+    'image_crop' => [
       'title' => t('Crop'),
       'callback' => 'cloudinary_transformation_image_crop',
       'file' => $path . '/includes/cloudinary.transformation.drupal.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.module b/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.module
index b74359b..6b56e08 100644
--- a/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.module
+++ b/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.module
@@ -112,7 +112,8 @@ function cloudinary_stream_wrapper_form_cloudinary_sdk_settings_alter(&$form, $f
         '@folder' => "{$folder['path']} [cloudinary.{$folder['path']}]",
       ]);
     }
-  } catch (\Exception $e) {
+  }
+  catch (\Exception $e) {
   }
 
   $form['folders'] = [
@@ -590,7 +591,7 @@ function cloudinary_stream_wrapper_remote_image_info($url, $filesize = FALSE) {
     if ($filesize) {
       $meta = stream_get_meta_data($handle);
       if (is_array($meta['wrapper_data'])) {
-        $headers = isset($meta['wrapper_data']['headers']) ? $meta['wrapper_data']['headers'] : $meta['wrapper_data'];
+        $headers = $meta['wrapper_data']['headers'] ?? $meta['wrapper_data'];
       }
       elseif (is_object($meta['wrapper_data']) && isset($meta['wrapper_data']->stream_headers)) {
         $headers = $meta['wrapper_data']->stream_headers;
@@ -631,7 +632,7 @@ function cloudinary_stream_wrapper_remote_image_info($url, $filesize = FALSE) {
 /**
  * Logging error messages.
  *
- * @param $message string
+ * @param string $message
  *   Error message.
  * @param array $options
  *   Message options.
diff --git a/modules/cloudinary_stream_wrapper/src/CloudinaryStreamWrapperServiceProvider.php b/modules/cloudinary_stream_wrapper/src/CloudinaryStreamWrapperServiceProvider.php
index 3eb468f..cb50f98 100644
--- a/modules/cloudinary_stream_wrapper/src/CloudinaryStreamWrapperServiceProvider.php
+++ b/modules/cloudinary_stream_wrapper/src/CloudinaryStreamWrapperServiceProvider.php
@@ -1,17 +1,18 @@
 <?php
-/**
- * Created by DOOR3 Business Applications, Inc.
- * Developer: Sean Robertson
- * Date: 8/2/16
- * Time: 2:46 PM
- */
+
 namespace Drupal\cloudinary_stream_wrapper;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderInterface;
 
-class CloudinaryStreamWrapperServiceProvider implements ServiceProviderInterface  {
+/**
+ *
+ */
+class CloudinaryStreamWrapperServiceProvider implements ServiceProviderInterface {
 
+  /**
+   *
+   */
   public function register(ContainerBuilder $container) {
     if (\Drupal::hasContainer()) {
       $folders = \Drupal::config('cloudinary_stream_wrapper.settings')->get('cloudinary_stream_wrapper_folders');
@@ -20,13 +21,13 @@ class CloudinaryStreamWrapperServiceProvider implements ServiceProviderInterface
       }
       if (!empty($folders)) {
         foreach ($folders as $folder) {
-          //$wrappers['cloudinary.' . $folder] = $base;
-          //$wrappers['cloudinary.' . $folder]['name'] .= ' (/' . $folder . ')';
-
+          // $wrappers['cloudinary.' . $folder] = $base;
+          // $wrappers['cloudinary.' . $folder]['name'] .= ' (/' . $folder . ')';
           $container->register('stream_wrapper.cloudinary.' . $folder, 'Drupal\cloudinary_stream_wrapper\StreamWrapper\CloudinaryStreamWrapper')
             ->addTag('stream_wrapper', ['scheme' => $folder]);
         }
       }
     }
   }
+
 }
diff --git a/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php b/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php
index 27b2a70..9ae0508 100644
--- a/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php
+++ b/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php
@@ -1,8 +1,8 @@
 <?php
+
 namespace Drupal\cloudinary_stream_wrapper\StreamWrapper;
 
 // These classes are used to implement a stream wrapper class.
-use Cloudinary\Api\Admin\AdminApi;
 use Cloudinary\Asset\Media;
 use Cloudinary\Configuration\Configuration;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
@@ -16,54 +16,54 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
    *
    * A stream is referenced as "scheme://target".
    *
-   * @var String
+   * @var string
    */
   protected $uri;
 
   /**
    * Folder name as a prefix name of public_id.
    *
-   * @var String
+   * @var string
    */
   protected $folderName = NULL;
 
   /**
    * The resource type of Cloudinary (image, raw).
    *
-   * @var String
+   * @var string
    */
   protected $resourceType = CLOUDINARY_STREAM_WRAPPER_RESOURCE_RAW;
 
   /**
    * The pointer to the next read or write.
    *
-   * @var Int
+   * @var int
    */
   protected $streamPointer = 0;
 
   /**
    * A buffer for reading/wrting.
    *
-   * @var String
+   * @var string
    */
   protected $streamData = NULL;
 
   /**
    * This $stream_write property is flagged for data written.
    *
-   * @var Boolean
+   * @var bool
    */
   protected $streamWrite = FALSE;
 
   /**
    * List of files in a given directory.
    */
-  protected $directoryList = array();
+  protected $directoryList = [];
 
   /**
    * A current file resource of Cloudinary.
    *
-   * @var Array
+   * @var array
    */
   protected $resource = NULL;
 
@@ -244,7 +244,7 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
       return FALSE;
     }
 
-    $stat = array();
+    $stat = [];
     $stat[0] = $stat['dev'] = 0;
     $stat[1] = $stat['ino'] = 0;
     $stat[2] = $stat['mode'] = $resource['mode'];
@@ -267,7 +267,7 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
    */
   protected function flush() {
     $this->folderName = NULL;
-    $this->directoryList = array();
+    $this->directoryList = [];
     $this->streamData = NULL;
     $this->streamPointer = 0;
     $this->streamWrite = FALSE;
@@ -372,7 +372,7 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
   /**
    * Base implementation of getMimeType().
    */
-  static public function getMimeType($uri, $mapping = NULL) {
+  public static function getMimeType($uri, $mapping = NULL) {
     if (!isset($mapping)) {
       // The default file map, defined in file.mimetypes.inc is quite big.
       // We only load it when necessary.
@@ -389,7 +389,7 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
     // For my.awesome.image.jpeg, we try:
     // - jpeg
     // - image.jpeg, and
-    // - awesome.image.jpeg
+    // - awesome.image.jpeg.
     while ($additional_part = array_pop($file_parts)) {
       $extension = strtolower($additional_part . ($extension ? '.' . $extension : ''));
       if (isset($mapping['extensions'][$extension])) {
@@ -510,7 +510,6 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
     return TRUE;
   }
 
-
   /**
    * Change stream options.
    *
@@ -656,7 +655,6 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
     return $this->streamPointer >= strlen($this->streamData);
   }
 
-
   /**
    * Support for fseek().
    *
@@ -716,11 +714,11 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
         $dirname = '';
       }
 
-      $options = array(
+      $options = [
         'public_id' => $public_id,
         'resource_type' => $this->resourceType,
         'tags' => CLOUDINARY_STREAM_WRAPPER_FOLDER_TAG_PREFIX . $dirname,
-      );
+      ];
 
       if (cloudinary_stream_wrapper_create_file($base64_data, $options)) {
         return TRUE;
@@ -859,7 +857,7 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
    */
   public function dirname($uri = NULL) {
     [$scheme, $target] = explode('://', $uri, 2);
-    $target  = $this->getTarget($uri);
+    $target = $this->getTarget($uri);
     $dirname = dirname($target);
 
     if ($dirname == '.') {
@@ -955,7 +953,7 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
     $resource = $this->loadResource($uri);
 
     if ($resource) {
-      $list = array('.', '..');
+      $list = ['.', '..'];
 
       if (isset($this->resource['folders']) && !empty($this->resource['folders'])) {
         $list = array_merge($list, $this->resource['folders']);
@@ -1021,7 +1019,7 @@ class CloudinaryStreamWrapper implements StreamWrapperInterface {
    * @see http://php.net/manual/streamwrapper.dir-closedir.php
    */
   public function dir_closedir() {
-    $this->directoryList = array();
+    $this->directoryList = [];
 
     return TRUE;
   }
diff --git a/src/Plugin/ImageEffect/CloudinaryCrop.php b/src/Plugin/ImageEffect/CloudinaryCrop.php
index 605ab95..bdc01eb 100644
--- a/src/Plugin/ImageEffect/CloudinaryCrop.php
+++ b/src/Plugin/ImageEffect/CloudinaryCrop.php
@@ -2,17 +2,13 @@
 
 namespace Drupal\cloudinary\Plugin\ImageEffect;
 
-use Cloudinary\Api\Admin\AdminApi;
 use Cloudinary\Transformation\Transformation;
 use Drupal\Component\Utility\Color;
 use Drupal\Component\Utility\Rectangle;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Image\ImageInterface;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
 use Drupal\image\ConfigurableImageEffectBase;
 use Drupal\image\Entity\ImageStyle;
-use Drupal\image\ImageEffectBase;
 
 /**
  * Provides a 'CloudinaryCrop' image effect.
@@ -35,7 +31,7 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
     }
 
     if (!$image->rotate($this->configuration['degrees'], $this->configuration['background'])) {
-      $this->logger->error('Image rotate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()));
+      $this->logger->error('Image rotate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()]);
       return FALSE;
     }
     return TRUE;
@@ -62,10 +58,10 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function getSummary() {
-    $summary = array(
+    $summary = [
       '#theme' => 'image_rotate_summary',
       '#data' => $this->configuration,
-    );
+    ];
     $summary += parent::getSummary();
 
     return $summary;
@@ -75,7 +71,7 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'width' => NULL,
       'height' => NULL,
       'crop' => NULL,
@@ -98,17 +94,17 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
       'quality' => NULL,
       'fetch_format' => NULL,
       'density' => NULL,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $container = array(
+    $container = [
       '#prefix' => '<div class="container-inline clearfix">',
       '#suffix' => '</div>',
-    );
+    ];
 
     $form['#attached']['library'] = [
       'core/ui.slider',
@@ -116,272 +112,272 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
       'cloudinary/cloudinary-lib',
     ];
 
-    $form['cloudinary'] = array();
+    $form['cloudinary'] = [];
 
     // Show the thumbnail preview.
-    $form['cloudinary']['preview'] = array(
+    $form['cloudinary']['preview'] = [
       '#prefix' => '<div class="clearfix">',
       '#suffix' => '</div>',
       '#tree' => FALSE,
-    );
+    ];
 
     $preview = $this->cloudinaryCropFormPreview();
-    $form['cloudinary']['preview']['thumbnail'] = array(
+    $form['cloudinary']['preview']['thumbnail'] = [
       '#prefix' => '<div id="cloudinary_transformation_preview">',
       '#suffix' => '</div>',
       '#type' => 'item',
       '#title' => $this->t('Preview'),
       '#markup' => \Drupal::service('renderer')->render($preview),
-    );
+    ];
 
-    $form['cloudinary']['preview']['reset'] = array(
+    $form['cloudinary']['preview']['reset'] = [
       '#value' => $this->t('Reset'),
       '#type' => 'button',
-    );
+    ];
 
-    $form['cloudinary']['preview']['preview'] = array(
+    $form['cloudinary']['preview']['preview'] = [
       '#value' => $this->t('Preview'),
       '#type' => 'button',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'cloudinary_crop_form_preview_callback',
         'wrapper' => 'cloudinary_transformation_preview',
-      ),
-    );
+      ],
+    ];
 
-    $form['cloudinary']['resize_crop'] = array(
+    $form['cloudinary']['resize_crop'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Resize & Crop'),
-    );
+    ];
 
     $form['cloudinary']['resize_crop']['one'] = $container;
 
-    $form['cloudinary']['resize_crop']['one']['width'] = array(
+    $form['cloudinary']['resize_crop']['one']['width'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'width'),
+      '#parents' => ['data', 'width'],
       '#title' => $this->t('Width'),
       '#default_value' => $this->configuration['width'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider')),
-    );
+      '#attributes' => ['class' => ['input_slider']],
+    ];
 
-    $form['cloudinary']['resize_crop']['one']['height'] = array(
+    $form['cloudinary']['resize_crop']['one']['height'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'height'),
+      '#parents' => ['data', 'height'],
       '#title' => $this->t('Height'),
       '#default_value' => $this->configuration['height'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider')),
-    );
+      '#attributes' => ['class' => ['input_slider']],
+    ];
 
-    $form['cloudinary']['resize_crop']['one']['crop'] = array(
+    $form['cloudinary']['resize_crop']['one']['crop'] = [
       '#type' => 'select',
-      '#parents' => array('data', 'crop'),
+      '#parents' => ['data', 'crop'],
       '#title' => $this->t('Mode'),
       '#default_value' => $this->configuration['crop'],
       '#options' => _cloudinary_options_crop(),
-    );
+    ];
 
     $form['cloudinary']['resize_crop']['two'] = $container;
 
-    $form['cloudinary']['resize_crop']['two']['gravity'] = array(
+    $form['cloudinary']['resize_crop']['two']['gravity'] = [
       '#type' => 'select',
-      '#parents' => array('data', 'gravity'),
+      '#parents' => ['data', 'gravity'],
       '#title' => $this->t('Gravity'),
       '#default_value' => $this->configuration['gravity'],
       '#options' => $this->getGravityOptions(),
-      '#states' => array(
-        'visible' => array(
+      '#states' => [
+        'visible' => [
           ':input[name="data[crop]"]' => $this->buildVisibleStates(CLOUDINARY_VISIBLE_STATES_CROP),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
-    $x_y_states = array('visible' => array(':input[name="data[crop]"]' => array(array('value' => 'crop'))));
-    $form['cloudinary']['resize_crop']['two']['x'] = array(
+    $x_y_states = ['visible' => [':input[name="data[crop]"]' => [['value' => 'crop']]]];
+    $form['cloudinary']['resize_crop']['two']['x'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'x'),
+      '#parents' => ['data', 'x'],
       '#title' => $this->t('X'),
       '#default_value' => $this->configuration['x'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider')),
+      '#attributes' => ['class' => ['input_slider']],
       '#states' => $x_y_states,
-    );
+    ];
 
-    $form['cloudinary']['resize_crop']['two']['y'] = array(
+    $form['cloudinary']['resize_crop']['two']['y'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'y'),
+      '#parents' => ['data', 'y'],
       '#title' => $this->t('Y'),
       '#default_value' => $this->configuration['y'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider')),
+      '#attributes' => ['class' => ['input_slider']],
       '#states' => $x_y_states,
-    );
+    ];
 
-    $form['cloudinary']['shape'] = array(
+    $form['cloudinary']['shape'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Shape'),
-    );
+    ];
 
     $form['cloudinary']['shape']['one'] = $container;
 
-    $form['cloudinary']['shape']['one']['radius'] = array(
+    $form['cloudinary']['shape']['one']['radius'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'radius'),
+      '#parents' => ['data', 'radius'],
       '#title' => $this->t('Corner Radius'),
       '#default_value' => $this->configuration['radius'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider'), 'data' => 'dynamic_0_100_slider-small'),
-    );
+      '#attributes' => ['class' => ['input_slider'], 'data' => 'dynamic_0_100_slider-small'],
+    ];
 
-    $form['cloudinary']['shape']['one']['angle'] = array(
+    $form['cloudinary']['shape']['one']['angle'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'angle'),
+      '#parents' => ['data', 'angle'],
       '#title' => $this->t('Rotation Angle'),
       '#default_value' => $this->configuration['angle'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider'), 'data' => 'fixed_0_360_slider-small'),
-    );
+      '#attributes' => ['class' => ['input_slider'], 'data' => 'fixed_0_360_slider-small'],
+    ];
 
-    $form['cloudinary']['shape']['one']['automatic_rotation'] = array(
+    $form['cloudinary']['shape']['one']['automatic_rotation'] = [
       '#type' => 'checkbox',
-      '#parents' => array('data', 'automatic_rotation'),
+      '#parents' => ['data', 'automatic_rotation'],
       '#title' => $this->t('Automatic rotation'),
       '#default_value' => $this->configuration['automatic_rotation'],
-    );
+    ];
 
     $form['cloudinary']['shape']['two'] = $container;
 
-    $form['cloudinary']['shape']['two']['angles'] = array(
+    $form['cloudinary']['shape']['two']['angles'] = [
       '#type' => 'checkboxes',
-      '#parents' => array('data', 'angles'),
+      '#parents' => ['data', 'angles'],
       '#title' => $this->t('Angles'),
       '#title_display' => 'invisible',
       '#default_value' => $this->configuration['angles'],
       '#options' => _cloudinary_options_angles(),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="data[automatic_rotation]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
-
-    $form['cloudinary']['look_feel'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="data[automatic_rotation]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+
+    $form['cloudinary']['look_feel'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Look & Feel'),
-    );
+    ];
 
     $form['cloudinary']['look_feel']['one'] = $container;
 
-    $form['cloudinary']['look_feel']['one']['effect'] = array(
+    $form['cloudinary']['look_feel']['one']['effect'] = [
       '#type' => 'select',
-      '#parents' => array('data', 'effect'),
+      '#parents' => ['data', 'effect'],
       '#title' => $this->t('Effect'),
       '#default_value' => $this->configuration['effect'],
       '#options' => _cloudinary_options_effect(),
-    );
+    ];
 
-    $form['cloudinary']['look_feel']['one']['effects_param'] = array(
+    $form['cloudinary']['look_feel']['one']['effects_param'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'effects_param'),
+      '#parents' => ['data', 'effects_param'],
       '#title_display' => 'invisible',
       '#title' => $this->t('Effects Param'),
       '#default_value' => $this->configuration['effects_param'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider'), 'data' => 'fixed_0_100_slider-small'),
-      '#states' => array(
-        'visible' => array(
+      '#attributes' => ['class' => ['input_slider'], 'data' => 'fixed_0_100_slider-small'],
+      '#states' => [
+        'visible' => [
           ':input[name="data[effect]"]' => $this->buildVisibleStates(CLOUDINARY_VISIBLE_STATES_EFFECT),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
-    $form['cloudinary']['more'] = array(
+    $form['cloudinary']['more'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('More Options'),
-    );
+    ];
 
-    $form['cloudinary']['more']['one'] = array(
+    $form['cloudinary']['more']['one'] = [
       '#prefix' => '<div id="farbtastic-color"></div><div class="container-inline clearfix">',
       '#suffix' => '</div>',
-    );
+    ];
 
-    $form['cloudinary']['more']['one']['opacity'] = array(
+    $form['cloudinary']['more']['one']['opacity'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'opacity'),
+      '#parents' => ['data', 'opacity'],
       '#title' => $this->t('Opacity'),
       '#default_value' => $this->configuration['opacity'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider'), 'data' => 'fixed_0_100_slider-small'),
-    );
+      '#attributes' => ['class' => ['input_slider'], 'data' => 'fixed_0_100_slider-small'],
+    ];
 
-    $form['cloudinary']['more']['one']['border_width'] = array(
+    $form['cloudinary']['more']['one']['border_width'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'border_width'),
+      '#parents' => ['data', 'border_width'],
       '#title' => $this->t('Border'),
       '#default_value' => $this->configuration['border_width'],
       '#size' => 4,
-      '#attributes' => array('class' => array('input_slider'), 'data' => 'dynamic_0_100_slider-small'),
-    );
+      '#attributes' => ['class' => ['input_slider'], 'data' => 'dynamic_0_100_slider-small'],
+    ];
 
-    $form['cloudinary']['more']['one']['border_color'] = array(
+    $form['cloudinary']['more']['one']['border_color'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'border_color'),
+      '#parents' => ['data', 'border_color'],
       '#title' => $this->t('Border color'),
       '#default_value' => $this->configuration['border_color'],
       '#size' => 8,
       '#maxlength' => 7,
-      '#attributes' => array('class' => array('input_color')),
-    );
+      '#attributes' => ['class' => ['input_color']],
+    ];
 
-    $form['cloudinary']['more']['one']['background'] = array(
+    $form['cloudinary']['more']['one']['background'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'background'),
+      '#parents' => ['data', 'background'],
       '#title' => $this->t('Background'),
       '#default_value' => $this->configuration['background'],
       '#size' => 8,
       '#maxlength' => 7,
-      '#attributes' => array('class' => array('input_color')),
-    );
+      '#attributes' => ['class' => ['input_color']],
+    ];
 
-    $form['cloudinary']['more']['one']['default_image'] = array(
+    $form['cloudinary']['more']['one']['default_image'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'default_image'),
+      '#parents' => ['data', 'default_image'],
       '#title' => t('Default Image'),
       '#default_value' => $this->configuration['default_image'],
       '#size' => 15,
       '#maxlength' => 15,
-      '#attributes' => array('class' => array('default_image')),
-    );
+      '#attributes' => ['class' => ['default_image']],
+    ];
 
-    $form['cloudinary']['more']['one']['quality'] = array(
+    $form['cloudinary']['more']['one']['quality'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'quality'),
+      '#parents' => ['data', 'quality'],
       '#title' => t('Image Optimization'),
       '#default_value' => $this->configuration['quality'],
       '#size' => 15,
       '#maxlength' => 15,
-      '#attributes' => array('class' => array('quality')),
-    );
+      '#attributes' => ['class' => ['quality']],
+    ];
 
-    $form['cloudinary']['more']['one']['fetch_format'] = array(
+    $form['cloudinary']['more']['one']['fetch_format'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'fetch_format'),
+      '#parents' => ['data', 'fetch_format'],
       '#title' => t('Fetch format'),
       '#default_value' => $this->configuration['fetch_format'],
       '#size' => 15,
       '#maxlength' => 15,
-      '#attributes' => array('class' => array('fetch_format')),
-    );
+      '#attributes' => ['class' => ['fetch_format']],
+    ];
 
-    $form['cloudinary']['more']['one']['density'] = array(
+    $form['cloudinary']['more']['one']['density'] = [
       '#type' => 'textfield',
-      '#parents' => array('data', 'density'),
+      '#parents' => ['data', 'density'],
       '#title' => t('Density'),
       '#default_value' => $this->configuration['density'] ?? '',
       '#size' => 15,
       '#maxlength' => 15,
-      '#attributes' => array('class' => array('density')),
-    );
+      '#attributes' => ['class' => ['density']],
+    ];
 
     return $form;
   }
@@ -390,7 +386,7 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
    * Build options for gravity.
    */
   protected function getGravityOptions($key = NULL) {
-    $data = array(
+    $data = [
       '' => t('None'),
       'face' => t('Face'),
       'faces' => t('Faces'),
@@ -410,7 +406,7 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
       'rek_face' => t('ReKognition: Face'),
       'rek_faces' => t('ReKognition: Faces'),
       'rek_eyes' => t('ReKognition: Eyes'),
-    );
+    ];
 
     if (!is_null($key) && isset($data[$key])) {
       return $data[$key];
@@ -471,7 +467,7 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
   /**
    * Generate cloudinary image preview for effect edit form.
    */
-  function cloudinaryCropFormPreview() {
+  public function cloudinaryCropFormPreview() {
     $filename = 'sample.jpg';
 
     if (isset($this->configuration['gravity'])) {
@@ -523,4 +519,5 @@ class CloudinaryCrop extends ConfigurableImageEffectBase {
     ];
 
   }
+
 }
diff --git a/src/Plugin/ImageEffect/CloudinaryNamedTransformation.php b/src/Plugin/ImageEffect/CloudinaryNamedTransformation.php
index 42edd45..b504291 100644
--- a/src/Plugin/ImageEffect/CloudinaryNamedTransformation.php
+++ b/src/Plugin/ImageEffect/CloudinaryNamedTransformation.php
@@ -55,8 +55,8 @@ class CloudinaryNamedTransformation extends ConfigurableImageEffectBase {
       '#type' => 'textfield',
       '#title' => $this->t('Named transformation'),
       '#description' => $this->t('Read more at <a href="@api-doc">the Cloudinary documentation</a>.', [
-          '@api-doc' => 'https://cloudinary.com/documentation/image_transformations#named_transformations',
-        ]
+        '@api-doc' => 'https://cloudinary.com/documentation/image_transformations#named_transformations',
+      ]
       ),
       '#default_value' => $this->configuration['transformation'],
       '#required' => TRUE,