diff --git a/app/Helpers/Csv/Converter/Amount.php b/app/Helpers/Csv/Converter/Amount.php
index bbad0932a0..7ec25ce17e 100644
--- a/app/Helpers/Csv/Converter/Amount.php
+++ b/app/Helpers/Csv/Converter/Amount.php
@@ -2,8 +2,6 @@
 
 namespace FireflyIII\Helpers\Csv\Converter;
 
-use FireflyIII\Models\Account;
-
 /**
  * Class Amount
  *
@@ -13,7 +11,7 @@ class Amount extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Account|null
+     * @return string|int
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/AmountComma.php b/app/Helpers/Csv/Converter/AmountComma.php
index 2427361148..73f067f7aa 100644
--- a/app/Helpers/Csv/Converter/AmountComma.php
+++ b/app/Helpers/Csv/Converter/AmountComma.php
@@ -2,8 +2,6 @@
 
 namespace FireflyIII\Helpers\Csv\Converter;
 
-use FireflyIII\Models\Account;
-
 /**
  * Class AmountComma
  * 
@@ -15,7 +13,7 @@ class AmountComma extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Account|null
+     * @return float|int
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/BudgetId.php b/app/Helpers/Csv/Converter/BudgetId.php
index 1025a289a2..5fa10d1fb0 100644
--- a/app/Helpers/Csv/Converter/BudgetId.php
+++ b/app/Helpers/Csv/Converter/BudgetId.php
@@ -5,7 +5,7 @@ use Auth;
 use FireflyIII\Models\Budget;
 
 /**
- * Class AccountId
+ * Class BudgetId
  *
  * @package FireflyIII\Helpers\Csv\Converter
  */
diff --git a/app/Helpers/Csv/Converter/CurrencyCode.php b/app/Helpers/Csv/Converter/CurrencyCode.php
index 598bd4bd5e..c17d675457 100644
--- a/app/Helpers/Csv/Converter/CurrencyCode.php
+++ b/app/Helpers/Csv/Converter/CurrencyCode.php
@@ -13,7 +13,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/CurrencyId.php b/app/Helpers/Csv/Converter/CurrencyId.php
index f620711bd1..25bf449850 100644
--- a/app/Helpers/Csv/Converter/CurrencyId.php
+++ b/app/Helpers/Csv/Converter/CurrencyId.php
@@ -13,7 +13,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/CurrencyName.php b/app/Helpers/Csv/Converter/CurrencyName.php
index 549cb922f2..95c57e7d31 100644
--- a/app/Helpers/Csv/Converter/CurrencyName.php
+++ b/app/Helpers/Csv/Converter/CurrencyName.php
@@ -13,7 +13,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/CurrencySymbol.php b/app/Helpers/Csv/Converter/CurrencySymbol.php
index c21617dc73..97184fdfb0 100644
--- a/app/Helpers/Csv/Converter/CurrencySymbol.php
+++ b/app/Helpers/Csv/Converter/CurrencySymbol.php
@@ -13,7 +13,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return mixed|static
+     * @return TransactionCurrency
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/Date.php b/app/Helpers/Csv/Converter/Date.php
index fa6a6a8cb4..d2487ccd24 100644
--- a/app/Helpers/Csv/Converter/Date.php
+++ b/app/Helpers/Csv/Converter/Date.php
@@ -17,7 +17,7 @@ class Date extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return static
+     * @return Carbon
      * @throws FireflyException
      */
     public function convert()
diff --git a/app/Helpers/Csv/Converter/Description.php b/app/Helpers/Csv/Converter/Description.php
index dfd704c25f..bb5626e251 100644
--- a/app/Helpers/Csv/Converter/Description.php
+++ b/app/Helpers/Csv/Converter/Description.php
@@ -12,7 +12,7 @@ class Description extends BasicConverter implements ConverterInterface
 
 
     /**
-     * @return mixed
+     * @return string
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/Ignore.php b/app/Helpers/Csv/Converter/Ignore.php
index d7175841bd..a9dff94088 100644
--- a/app/Helpers/Csv/Converter/Ignore.php
+++ b/app/Helpers/Csv/Converter/Ignore.php
@@ -2,8 +2,6 @@
 
 namespace FireflyIII\Helpers\Csv\Converter;
 
-use FireflyIII\Models\Account;
-
 /**
  * Class Amount
  *
@@ -13,7 +11,7 @@ class Ignore extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Account|null
+     * @return null
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/OpposingAccountId.php b/app/Helpers/Csv/Converter/OpposingAccountId.php
index f0379d57b3..48d0cbe6e0 100644
--- a/app/Helpers/Csv/Converter/OpposingAccountId.php
+++ b/app/Helpers/Csv/Converter/OpposingAccountId.php
@@ -6,7 +6,7 @@ use Auth;
 use FireflyIII\Models\Account;
 
 /**
- * Class OpposingName
+ * Class OpposingAccountId
  *
  * @package FireflyIII\Helpers\Csv\Converter
  */
diff --git a/app/Helpers/Csv/Converter/OpposingAccountName.php b/app/Helpers/Csv/Converter/OpposingAccountName.php
index 01efa1c8fd..ef9e9ad97c 100644
--- a/app/Helpers/Csv/Converter/OpposingAccountName.php
+++ b/app/Helpers/Csv/Converter/OpposingAccountName.php
@@ -6,7 +6,7 @@ use Auth;
 use FireflyIII\Models\Account;
 
 /**
- * Class OpposingName
+ * Class OpposingAccountName
  *
  * @package FireflyIII\Helpers\Csv\Converter
  */
diff --git a/app/Helpers/Csv/Converter/RabobankDebetCredit.php b/app/Helpers/Csv/Converter/RabobankDebetCredit.php
index 933bc9e245..1861f6e172 100644
--- a/app/Helpers/Csv/Converter/RabobankDebetCredit.php
+++ b/app/Helpers/Csv/Converter/RabobankDebetCredit.php
@@ -13,7 +13,7 @@ class RabobankDebetCredit extends BasicConverter implements ConverterInterface
 
 
     /**
-     * @return mixed
+     * @return int
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/TagsComma.php b/app/Helpers/Csv/Converter/TagsComma.php
index b854d2a09f..9356856294 100644
--- a/app/Helpers/Csv/Converter/TagsComma.php
+++ b/app/Helpers/Csv/Converter/TagsComma.php
@@ -3,7 +3,6 @@
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\Tag;
 use Illuminate\Support\Collection;
 
@@ -16,7 +15,7 @@ class TagsComma extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Bill
+     * @return Collection
      */
     public function convert()
     {
diff --git a/app/Helpers/Csv/Converter/TagsSpace.php b/app/Helpers/Csv/Converter/TagsSpace.php
index 14d91a34f8..323f6005cc 100644
--- a/app/Helpers/Csv/Converter/TagsSpace.php
+++ b/app/Helpers/Csv/Converter/TagsSpace.php
@@ -3,7 +3,6 @@
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\Tag;
 use Illuminate\Support\Collection;
 
@@ -16,7 +15,7 @@ class TagsSpace extends BasicConverter implements ConverterInterface
 {
 
     /**
-     * @return Bill
+     * @return Collection
      */
     public function convert()
     {