diff --git a/drowl_media.install b/drowl_media.install
index fcbbe91..c09eccd 100755
--- a/drowl_media.install
+++ b/drowl_media.install
@@ -1,5 +1,6 @@
 <?php
 
+use Drupal\Core\Extension\MissingDependencyException;
 /**
  * @file
  * Install, update and uninstall functions for the DROWL Media module.
@@ -113,7 +114,7 @@ function drowl_media_update_8201(&$sandbox) {
     if(\Drupal::service('module_installer')->install(['media_entity_actions'])){
       return 'Enabled Module "media_entity_actions" successfully.';
     }
-  } catch (\Drupal\Core\Extension\MissingDependencyException $e){
+  } catch (MissingDependencyException $e){
     return t('Module "@module" was not enabled due to the following error: "@message"', ['@module' => 'media_entity_actions', '@message' => $e->getMessage()]);
   }
 }
@@ -126,7 +127,7 @@ function drowl_media_update_8202(&$sandbox) {
     if(\Drupal::service('module_installer')->install(['media_entity_image_exif'])){
       return 'Enabled Module "media_entity_image_exif" successfully.';
     }
-  } catch (\Drupal\Core\Extension\MissingDependencyException $e){
+  } catch (MissingDependencyException $e){
     return t('Module "@module" was not enabled due to the following error: "@message"', ['@module' => 'media_entity_image_exif', '@message' => $e->getMessage()]);
   }
 }
@@ -223,7 +224,7 @@ function drowl_media_update_8206(&$sandbox) {
     if(\Drupal::service('module_installer')->install(['media_library'])){
       return 'Enabled Module "media_library" successfully.';
     }
-  } catch (\Drupal\Core\Extension\MissingDependencyException $e){
+  } catch (MissingDependencyException $e){
     return t('Module "@module" was not enabled due to the following error: "@message"', ['@module' => 'media_library', '@message' => $e->getMessage()]);
   }
-}
+}
diff --git a/drowl_media.module b/drowl_media.module
index 41a2fe1..af7ea62 100644
--- a/drowl_media.module
+++ b/drowl_media.module
@@ -1,10 +1,12 @@
 <?php
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\views\ViewExecutable;
 /**
  * @file
  * DROWL media enhancements.
  */
 
-function drowl_media_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+function drowl_media_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   // Only allow a subset of image styles in the media embed widget for image preview.
   if (strpos($form_id, 'entity_embed_dialog') === 0) {
     if (!empty($form['attributes']['data-entity-embed-display-settings']['image_style'])) {
@@ -28,7 +30,7 @@ function drowl_media_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $fo
 /**
  * Implements hook_views_pre_render().
  */
-function drowl_media_views_pre_render(\Drupal\views\ViewExecutable $view) {
+function drowl_media_views_pre_render(ViewExecutable $view) {
   if (isset($view) && ($view->storage->id() == 'media_library')) {
     // Attach on view:
     $view->element['#attached']['library'][] = 'drowl_media/drowl-media-library';
@@ -38,7 +40,7 @@ function drowl_media_views_pre_render(\Drupal\views\ViewExecutable $view) {
 /**
  * Implements hook_field_widget_form_alter().
  */
-function drowl_media_field_widget_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
+function drowl_media_field_widget_form_alter(&$element, FormStateInterface $form_state, $context) {
   if (!empty($context['widget']) && in_array($context['widget']->getPluginId(), ['entity_browser_entity_reference', 'media_library_widget'])) {
     // Attach in media library widget:
     $element['#attached']['library'][] = 'drowl_media/drowl-media-library';
diff --git a/modules/drowl_media_types/drowl_media_types.install b/modules/drowl_media_types/drowl_media_types.install
index a58801d..950382a 100755
--- a/modules/drowl_media_types/drowl_media_types.install
+++ b/modules/drowl_media_types/drowl_media_types.install
@@ -3,13 +3,12 @@
 /**
  * @file
  * Install, update and uninstall functions for the DROWL Media Types module.
- */
-
-// TODO - This was just a try... perhaps it's better to reinstall this module in drowl_media 2.x update hook.
+ */
+// TODO - This was just a try... perhaps it's better to reinstall this module in drowl_media 2.x update hook.
 /**
- * (Re-)import optional configuration. If this is not enough, import configuration from the
+ * (Re-)import optional configuration. If this is not enough, import configuration from the
  * config/optional directory manually.
- */
-// function drowl_media_types_update_8200(&$sandbox){
-//   \Drupal::service('config.installer')->installDefaultConfig('module', 'drowl_media_types');
-// }
+ */
+// function drowl_media_types_update_8200(&$sandbox){
+//   \Drupal::service('config.installer')->installDefaultConfig('module', 'drowl_media_types');
+// }
diff --git a/modules/drowl_media_video/drowl_media_video.module b/modules/drowl_media_video/drowl_media_video.module
index 77ce824..9b64794 100644
--- a/modules/drowl_media_video/drowl_media_video.module
+++ b/modules/drowl_media_video/drowl_media_video.module
@@ -8,7 +8,7 @@ use Drupal\Core\Ajax\InvokeCommand;
 /**
  * Media Video Handling.
  */
-function drowl_media_video_form_media_video_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id){
+function drowl_media_video_form_media_video_form_alter(&$form, FormStateInterface $form_state, $form_id){
   
   // Copy video url into the video embed input field after file upload:
 
@@ -20,4 +20,4 @@ function drowl_media_video_form_media_video_form_alter(&$form, \Drupal\Core\Form
   // ];
   // Working alternative currently:
   $form['field_video_file']['widget']['#attached']['library'][] = 'drowl_media_video/drowl-media-video';
-}
\ No newline at end of file
+}