diff --git a/src/flextype/Foundation/Media/MediaFiles.php b/src/flextype/Foundation/Media/MediaFiles.php
index a13250c1..43f4020b 100644
--- a/src/flextype/Foundation/Media/MediaFiles.php
+++ b/src/flextype/Foundation/Media/MediaFiles.php
@@ -14,10 +14,13 @@ use Intervention\Image\ImageManagerStatic as Image;
 use RuntimeException;
 use Slim\Http\Environment;
 use Slim\Http\Uri;
+use Throwable;
+
 use function basename;
 use function chmod;
 use function exif_read_data;
 use function explode;
+use function flextype;
 use function getimagesize;
 use function in_array;
 use function is_dir;
@@ -36,6 +39,7 @@ use function strstr;
 use function strtolower;
 use function substr;
 use function time;
+
 use const DIRECTORY_SEPARATOR;
 use const PATHINFO_EXTENSION;
 use const UPLOAD_ERR_INI_SIZE;
@@ -76,22 +80,28 @@ class MediaFiles
         $exif_data = [];
 
         // Tests if a successful upload has been made.
-        if (isset($file['error'])
+        if (
+            isset($file['error'])
             and isset($file['tmp_name'])
             and $file['error'] === UPLOAD_ERR_OK
-            and is_uploaded_file($file['tmp_name'])) {
+            and is_uploaded_file($file['tmp_name'])
+        ) {
             // Tests if upload data is valid, even if no file was uploaded.
-            if (isset($file['error'])
+            if (
+                isset($file['error'])
                     and isset($file['name'])
                     and isset($file['type'])
                     and isset($file['tmp_name'])
-                    and isset($file['size'])) {
+                    and isset($file['size'])
+            ) {
                 // Test if an uploaded file is an allowed file type, by extension.
                 if (strpos($accept_file_types, strtolower(pathinfo($file['name'], PATHINFO_EXTENSION))) !== false) {
                     // Validation rule to test if an uploaded file is allowed by file size.
-                    if (($file['error'] !== UPLOAD_ERR_INI_SIZE)
+                    if (
+                        ($file['error'] !== UPLOAD_ERR_INI_SIZE)
                                   and ($file['error'] === UPLOAD_ERR_OK)
-                                  and ($file['size'] <= $max_file_size)) {
+                                  and ($file['size'] <= $max_file_size)
+                    ) {
                         // Validation rule to test if an upload is an image and, optionally, is the correct size.
                         if (in_array(mime_content_type($file['tmp_name']), ['image/jpeg', 'image/jpg', 'image/png', 'image/gif'])) {
                             function validateImage($file, $max_image_width, $max_image_height, $exact)
@@ -163,17 +173,17 @@ class MediaFiles
 
                                 // now you are able to resize the instance
                                 if (flextype('registry')->get('flextype.settings.media.image_width') > 0 && flextype('registry')->get('flextype.settings.media.image_height') > 0) {
-                                    $img->resize(flextype('registry')->get('flextype.settings.media.image_width'), flextype('registry')->get('flextype.settings.media.image_height'), static function ($constraint) : void {
+                                    $img->resize(flextype('registry')->get('flextype.settings.media.image_width'), flextype('registry')->get('flextype.settings.media.image_height'), static function ($constraint): void {
                                         $constraint->aspectRatio();
                                         $constraint->upsize();
                                     });
                                 } elseif (flextype('registry')->get('flextype.settings.media.image_width') > 0) {
-                                    $img->resize(flextype('registry')->get('flextype.settings.media.image_width'), null, static function ($constraint) : void {
+                                    $img->resize(flextype('registry')->get('flextype.settings.media.image_width'), null, static function ($constraint): void {
                                         $constraint->aspectRatio();
                                         $constraint->upsize();
                                     });
                                 } elseif (flextype('registry')->get('flextype.settings.media.image_height') > 0) {
-                                    $img->resize(null, flextype('registry')->get('flextype.settings.media.image_height'), static function ($constraint) : void {
+                                    $img->resize(null, flextype('registry')->get('flextype.settings.media.image_height'), static function ($constraint): void {
                                         $constraint->aspectRatio();
                                         $constraint->upsize();
                                     });
@@ -192,8 +202,7 @@ class MediaFiles
                                     foreach ($headers['COMPUTED'] as $header => $value) {
                                         $exif_data[$header] = $value;
                                     }
-                                } catch (\Exception $e) {
-
+                                } catch (Throwable $e) {
                                 }
                             }
 
@@ -229,7 +238,7 @@ class MediaFiles
      *
      * @return array A list of file(s) metadata.
      */
-    public function fetch(string $path) : array
+    public function fetch(string $path): array
     {
         // Get list if file or files for specific folder
         if (is_dir($path)) {
@@ -248,7 +257,7 @@ class MediaFiles
      *
      * @return array A file metadata.
      */
-    public function fetchSingle(string $path) : array
+    public function fetchSingle(string $path): array
     {
         $result = [];
 
@@ -281,7 +290,7 @@ class MediaFiles
      *
      * @return array A list of files metadata.
      */
-    public function fetchCollection(string $path) : array
+    public function fetchCollection(string $path): array
     {
         $result = [];
 
@@ -317,7 +326,7 @@ class MediaFiles
      *
      * @access public
      */
-    public function rename(string $id, string $new_id) : bool
+    public function rename(string $id, string $new_id): bool
     {
         if (! Filesystem::has($this->getFileLocation($new_id)) && ! Filesystem::has(flextype('media_files_meta')->getFileMetaLocation($new_id))) {
             return rename($this->getFileLocation($id), $this->getFileLocation($new_id)) && rename(flextype('media_files_meta')->getFileMetaLocation($id), flextype('media_files_meta')->getFileMetaLocation($new_id));
@@ -335,7 +344,7 @@ class MediaFiles
      *
      * @access public
      */
-    public function delete(string $id) : bool
+    public function delete(string $id): bool
     {
         return Filesystem::delete($this->getFileLocation($id)) &&
             Filesystem::delete(flextype('media_files_meta')->getFileMetaLocation($id));
@@ -350,7 +359,7 @@ class MediaFiles
      *
      * @access public
      */
-    public function has(string $id) : bool
+    public function has(string $id): bool
     {
         return Filesystem::has($this->getFileLocation($id)) &&
             Filesystem::has(flextype('media_files_meta')->getFileMetaLocation($id));
@@ -366,7 +375,7 @@ class MediaFiles
      *
      * @access public
      */
-    public function copy(string $id, string $new_id) : bool
+    public function copy(string $id, string $new_id): bool
     {
         if (! Filesystem::has($this->getFileLocation($new_id)) && ! Filesystem::has(flextype('media_files_meta')->getFileMetaLocation($new_id))) {
             Filesystem::copy(
@@ -395,7 +404,7 @@ class MediaFiles
      *
      * @access public
      */
-    public function getFileLocation(string $id) : string
+    public function getFileLocation(string $id): string
     {
         return PATH['project'] . '/uploads/' . $id;
     }
diff --git a/src/flextype/Foundation/Media/MediaFilesMeta.php b/src/flextype/Foundation/Media/MediaFilesMeta.php
index 1cfea52a..d50ac22e 100644
--- a/src/flextype/Foundation/Media/MediaFilesMeta.php
+++ b/src/flextype/Foundation/Media/MediaFilesMeta.php
@@ -12,6 +12,8 @@ namespace Flextype\Foundation\Media;
 use Flextype\Component\Arrays\Arrays;
 use Flextype\Component\Filesystem\Filesystem;
 
+use function flextype;
+
 class MediaFilesMeta
 {
     /**
@@ -25,7 +27,7 @@ class MediaFilesMeta
      *
      * @access public
      */
-    public function update(string $id, string $field, string $value) : bool
+    public function update(string $id, string $field, string $value): bool
     {
         $file_data = flextype('yaml')->decode(Filesystem::read($this->getFileMetaLocation($id)));
 
@@ -49,7 +51,7 @@ class MediaFilesMeta
      *
      * @access public
      */
-    public function add(string $id, string $field, string $value) : bool
+    public function add(string $id, string $field, string $value): bool
     {
         $file_data = flextype('yaml')->decode(Filesystem::read($this->getFileMetaLocation($id)));
 
@@ -72,7 +74,7 @@ class MediaFilesMeta
      *
      * @access public
      */
-    public function delete(string $id, string $field) : bool
+    public function delete(string $id, string $field): bool
     {
         $file_data = flextype('yaml')->decode(Filesystem::read($this->getFileMetaLocation($id)));
 
@@ -94,7 +96,7 @@ class MediaFilesMeta
      *
      * @access public
      */
-    public function getFileMetaLocation(string $id) : string
+    public function getFileMetaLocation(string $id): string
     {
         return PATH['project'] . '/uploads/.meta/' . $id . '.yaml';
     }
diff --git a/src/flextype/Foundation/Media/MediaFolders.php b/src/flextype/Foundation/Media/MediaFolders.php
index a2d5665c..a9298deb 100644
--- a/src/flextype/Foundation/Media/MediaFolders.php
+++ b/src/flextype/Foundation/Media/MediaFolders.php
@@ -12,6 +12,8 @@ namespace Flextype\Foundation\Media;
 use Flextype\Component\Filesystem\Filesystem;
 use Slim\Http\Environment;
 use Slim\Http\Uri;
+
+use function flextype;
 use function rename;
 use function str_replace;
 
@@ -25,7 +27,7 @@ class MediaFolders
      *
      * @return array A list of file(s) metadata.
      */
-    public function fetch(string $path, bool $collection = false) : array
+    public function fetch(string $path, bool $collection = false): array
     {
         if ($collection) {
             return $this->fetchCollection($path);
@@ -41,7 +43,7 @@ class MediaFolders
      *
      * @return array A file metadata.
      */
-    public function fetchsingle(string $path) : array
+    public function fetchsingle(string $path): array
     {
         $result = [];
 
@@ -69,7 +71,7 @@ class MediaFolders
      *
      * @return array A list of files metadata.
      */
-    public function fetchCollection(string $path) : array
+    public function fetchCollection(string $path): array
     {
         $result = [];
 
@@ -93,7 +95,7 @@ class MediaFolders
      *
      * @access public
      */
-    public function create(string $id) : bool
+    public function create(string $id): bool
     {
         if (! Filesystem::has($this->getDirLocation($id)) && ! Filesystem::has(flextype('media_folders_meta')->getDirMetaLocation($id))) {
             return Filesystem::createDir($this->getDirLocation($id)) && Filesystem::createDir(flextype('media_folders_meta')->getDirMetaLocation($id));
@@ -112,7 +114,7 @@ class MediaFolders
      *
      * @access public
      */
-    public function rename(string $id, string $new_id) : bool
+    public function rename(string $id, string $new_id): bool
     {
         if (! Filesystem::has($this->getDirLocation($new_id)) && ! Filesystem::has(flextype('media_folders_meta')->getDirMetaLocation($new_id))) {
             return rename($this->getDirLocation($id), $this->getDirLocation($new_id)) && rename(flextype('media_folders_meta')->getDirMetaLocation($id), flextype('media_folders_meta')->getDirMetaLocation($new_id));
@@ -131,7 +133,7 @@ class MediaFolders
      *
      * @access public
      */
-    public function copy(string $id, string $new_id) : bool
+    public function copy(string $id, string $new_id): bool
     {
         if (! Filesystem::has($this->getDirLocation($new_id)) && ! Filesystem::has(flextype('media_folders_meta')->getDirMetaLocation($new_id))) {
             Filesystem::copy(
@@ -160,7 +162,7 @@ class MediaFolders
      *
      * @access public
      */
-    public function delete(string $id) : bool
+    public function delete(string $id): bool
     {
         return Filesystem::deleteDir($this->getDirLocation($id)) &&
             Filesystem::deleteDir(flextype('media_folders_meta')->getDirMetaLocation($id));
@@ -175,7 +177,7 @@ class MediaFolders
      *
      * @access public
      */
-    public function getDirLocation(string $id) : string
+    public function getDirLocation(string $id): string
     {
         return PATH['project'] . '/uploads/' . $id;
     }
diff --git a/src/flextype/Foundation/Media/MediaFoldersMeta.php b/src/flextype/Foundation/Media/MediaFoldersMeta.php
index 519dc5de..dc88e27f 100644
--- a/src/flextype/Foundation/Media/MediaFoldersMeta.php
+++ b/src/flextype/Foundation/Media/MediaFoldersMeta.php
@@ -20,7 +20,7 @@ class MediaFoldersMeta
      *
      * @access public
      */
-    public function getDirMetaLocation(string $id) : string
+    public function getDirMetaLocation(string $id): string
     {
         return PATH['project'] . '/uploads/.meta/' . $id;
     }