diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index 4b00493..b8963a7 100644
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\filebrowser\Controller\DefaultController.
- */
 
 namespace Drupal\filebrowser\Controller;
 
diff --git a/src/EventSubscriber/MetadataInfoEventSubscriber.php b/src/EventSubscriber/MetadataInfoEventSubscriber.php
index 54e837a..457944b 100644
--- a/src/EventSubscriber/MetadataInfoEventSubscriber.php
+++ b/src/EventSubscriber/MetadataInfoEventSubscriber.php
@@ -21,31 +21,31 @@ class MetadataInfoEventSubscriber implements EventSubscriberInterface {
     /** @var MetadataInfo $event */
     $info = [
       Common::ICON => [
-        'title' => t('Icon'),
+        'title' => $this->t('Icon'),
       ],
       Common::NAME => [
-        'title' => t('Name'),
+        'title' => $this->t('Name'),
         'sortable' => TRUE,
         'type' => 'string'
       ],
       Common::CREATED => [
-        'title' => t('Created'),
+        'title' => $this->t('Created'),
         //'sortable' => TRUE,
         'type' => 'integer'
       ],
       Common::SIZE => [
-        'title' => t('Size'),
+        'title' => $this->t('Size'),
         // fixme: formatted size not sortable
         'sortable' => false,
         'type' => 'integer'
       ],
       Common::MIME_TYPE => [
-        'title' => t('Mime type'),
+        'title' => $this->t('Mime type'),
         'sortable' => TRUE,
         'type' => 'string'
       ],
       Common::DESCRIPTION => [
-        'title' => t('Description'),
+        'title' => $this->t('Description'),
         'writable' => TRUE,
         //'sortable' => TRUE,
         'type' => 'string',
diff --git a/src/EventSubscriber/UserActionsEventSubscriber.php b/src/EventSubscriber/UserActionsEventSubscriber.php
index b0cc75f..9f68459 100644
--- a/src/EventSubscriber/UserActionsEventSubscriber.php
+++ b/src/EventSubscriber/UserActionsEventSubscriber.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\filebrowser\ActionsInfoEventSubscriber.
- */
-
 namespace Drupal\filebrowser\EventSubscriber;
 
 use Drupal\filebrowser\Events\UserActionsEvent;
@@ -39,19 +34,19 @@ class UserActionsEventSubscriber implements EventSubscriberInterface {
       if (\Drupal::service('filebrowser.common')->canDownloadArchive($node) && function_exists('zip_open')) {
         $actions[] = array(
           'operation' => 'download',
-          'title' => t("Download selected items as an ZIP archive (only files)")
+          'title' => $this->t("Download selected items as an ZIP archive (only files)")
         );
       }
       if (\Drupal::currentUser()->hasPermission(Common::DELETE_FILES)) {
         $actions[] = array(
           'operation' => 'delete',
-          'title' => t("Delete selected items")
+          'title' => $this->t("Delete selected items")
         );
       }
       if (\Drupal::currentUser()->hasPermission(Common::DELETE_FILES)) {
         $actions[] = array(
           'operation' => 'rename',
-          'title' => t("Rename selected items")
+          'title' => $this->t("Rename selected items")
         );
       }
     }