diff --git a/app/Export/Processor.php b/app/Export/Processor.php
index 15960d63f6..0d0421a460 100644
--- a/app/Export/Processor.php
+++ b/app/Export/Processor.php
@@ -155,7 +155,7 @@ class Processor implements ProcessorInterface
         $zip->close();
 
         // delete the files:
-        $this->deleteFiles($disk);
+        $this->deleteFiles();
 
         return true;
     }
@@ -183,10 +183,11 @@ class Processor implements ProcessorInterface
     }
 
     /**
-     * @param FilesystemAdapter $disk
+     *
      */
-    private function deleteFiles(FilesystemAdapter $disk)
+    private function deleteFiles()
     {
+        $disk = Storage::disk('export');
         foreach ($this->getFiles() as $file) {
             $disk->delete($file);
         }
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index ebeec3b1d3..45f5583b9a 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -217,8 +217,8 @@ class ConvertController extends Controller
         switch ($joined) {
             default:
                 throw new FireflyException('Cannot handle ' . $joined);
-            case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: # one
-            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: #six
+            case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one
+            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six
                 $data   = [
                     'name'           => $data['source_account_revenue'],
                     'accountType'    => 'revenue',
@@ -228,14 +228,14 @@ class ConvertController extends Controller
                 ];
                 $source = $accountRepository->store($data);
                 break;
-            case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: # two
-            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: #five
+            case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: // two
+            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: // five
                 $source = $sourceAccount;
                 break;
-            case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: # three
+            case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three
                 $source = $destinationAccount;
                 break;
-            case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: # four
+            case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: // four
                 $source = $accountRepository->find(intval($data['source_account_asset']));
                 break;
         }
diff --git a/app/Rules/Triggers/AbstractTrigger.php b/app/Rules/Triggers/AbstractTrigger.php
index f3be138f8a..a2492e1a13 100644
--- a/app/Rules/Triggers/AbstractTrigger.php
+++ b/app/Rules/Triggers/AbstractTrigger.php
@@ -23,7 +23,7 @@ use FireflyIII\Models\TransactionJournal;
  *
  * @package FireflyIII\Rules\Triggers
  */
-class AbstractTrigger
+final class AbstractTrigger
 {
     /** @var  bool */
     public $stopProcessing;