diff --git a/src/Form/YoutubeSettingsForm.php b/src/Form/YoutubeSettingsForm.php
index 12d2ef5..536eed4 100644
--- a/src/Form/YoutubeSettingsForm.php
+++ b/src/Form/YoutubeSettingsForm.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\youtube\Form\YoutubeSettingsForm.
- */
 
 namespace Drupal\youtube\Form;
 
diff --git a/src/Plugin/Field/FieldFormatter/YouTubeFormatter.php b/src/Plugin/Field/FieldFormatter/YouTubeFormatter.php
index 1443a71..785f3c5 100644
--- a/src/Plugin/Field/FieldFormatter/YouTubeFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/YouTubeFormatter.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\youtube\Plugin\Field\FieldFormatter\YouTubeFormatter.
- */
 
 namespace Drupal\youtube\Plugin\Field\FieldFormatter;
 
diff --git a/src/Plugin/Field/FieldFormatter/YouTubeThumbFormatter.php b/src/Plugin/Field/FieldFormatter/YouTubeThumbFormatter.php
index 3d41b85..526d3b5 100644
--- a/src/Plugin/Field/FieldFormatter/YouTubeThumbFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/YouTubeThumbFormatter.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\youtube\Plugin\Field\FieldFormatter\YouTubeThumbFormatter.
- */
 
 namespace Drupal\youtube\Plugin\Field\FieldFormatter;
 
diff --git a/src/Plugin/Field/FieldFormatter/YouTubeUrlFormatter.php b/src/Plugin/Field/FieldFormatter/YouTubeUrlFormatter.php
index 3cd7bec..f07f1a1 100644
--- a/src/Plugin/Field/FieldFormatter/YouTubeUrlFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/YouTubeUrlFormatter.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\youtube\Plugin\Field\FieldFormatter\YouTubeThumbFormatter.
- */
-
 namespace Drupal\youtube\Plugin\Field\FieldFormatter;
 
 use Drupal\Component\Utility\Html;
diff --git a/src/Plugin/Field/FieldType/YouTubeItem.php b/src/Plugin/Field/FieldType/YouTubeItem.php
index 8dda193..7ba6713 100644
--- a/src/Plugin/Field/FieldType/YouTubeItem.php
+++ b/src/Plugin/Field/FieldType/YouTubeItem.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\youtube\Plugin\Field\FieldType\YouTubeItem.
- */
 
 namespace Drupal\youtube\Plugin\Field\FieldType;
 
diff --git a/src/Plugin/Field/FieldWidget/YouTubeDefaultWidget.php b/src/Plugin/Field/FieldWidget/YouTubeDefaultWidget.php
index faef8c9..4886c95 100644
--- a/src/Plugin/Field/FieldWidget/YouTubeDefaultWidget.php
+++ b/src/Plugin/Field/FieldWidget/YouTubeDefaultWidget.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\youtube\Plugin\Field\FieldWidget\YouTubeDefaultWidget.
- */
 
 namespace Drupal\youtube\Plugin\Field\FieldWidget;
 
diff --git a/src/Tests/YouTubeTest.php b/src/Tests/YouTubeTest.php
index fbb434f..ce71a25 100644
--- a/src/Tests/YouTubeTest.php
+++ b/src/Tests/YouTubeTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\youtube\Tests\YouTubeTest.
- */
 
 namespace Drupal\youtube\Tests;
 
diff --git a/youtube.module b/youtube.module
index 9c887ea..74fb042 100644
--- a/youtube.module
+++ b/youtube.module
@@ -277,7 +277,7 @@ function youtube_get_dimensions($size = NULL, $width = NULL, $height = NULL) {
 /**
  * Retrieves the thumbnail image for a given video from YouTube.
  *
- * @param integer $video_id
+ * @param int $video_id
  *   The video ID of the particular YouTube video.
  * @param bool $force_small
  *   (optional) When TRUE, this function should return the standard size image
@@ -285,7 +285,7 @@ function youtube_get_dimensions($size = NULL, $width = NULL, $height = NULL) {
  *   should the high resolution image be found to not exist for a particular
  *   video.
  *
- * @return bool|stdClass
+ * @return bool|object
  *   Either the Drupal $file object of saved image, or FALSE if the save failed.
  */
 function youtube_get_remote_image($video_id = NULL, $force_small = FALSE) {
@@ -338,8 +338,7 @@ function youtube_get_remote_image($video_id = NULL, $force_small = FALSE) {
       'Unable to save youtube thumbnail to filesystem for video %id',
       array('%id' => $video_id));
     return FALSE;
-   }
-
+  }
   return $file;
 }
 
@@ -359,7 +358,7 @@ function youtube_thumb_delete_all($form, &$form_state) {
 
   foreach ($files as $raw_file) {
     $database = \Drupal::database();
-    $data = $database->select('file_managed','fm')
+    $data = $database->select('file_managed', 'fm')
       ->fields('fm')
       ->condition('uri', '%' . $raw_file->uri, 'LIKE')
       ->execute()