diff --git a/app/Helpers/Csv/Wizard.php b/app/Helpers/Csv/Wizard.php
index a443fa06f1..24dc382795 100644
--- a/app/Helpers/Csv/Wizard.php
+++ b/app/Helpers/Csv/Wizard.php
@@ -19,7 +19,6 @@ use Session;
 class Wizard implements WizardInterface
 {
 
-
     /**
      * @param Reader $reader
      * @param array  $map
@@ -33,11 +32,12 @@ class Wizard implements WizardInterface
         /*
          * Loop over the CSV and collect mappable data:
          */
+        $keys = array_keys($map);
         foreach ($reader as $index => $row) {
-            if (($hasHeaders && $index > 1) || !$hasHeaders) {
+            if ($this->useRow($hasHeaders, $index)) {
                 // collect all map values
-                foreach ($map as $column => $irrelevant) {
-                    // check if $irrelevant is mappable!
+
+                foreach ($keys as $column) {
                     $values[$column][] = $row[$column];
                 }
             }
@@ -52,7 +52,6 @@ class Wizard implements WizardInterface
         return $values;
     }
 
-
     /**
      * @param array $roles
      * @param mixed $map
@@ -120,7 +119,6 @@ class Wizard implements WizardInterface
         return true;
     }
 
-
     /**
      * @param array $map
      *
@@ -168,4 +166,15 @@ class Wizard implements WizardInterface
 
 
     }
+
+    /**
+     * @param bool $hasHeaders
+     * @param int  $index
+     *
+     * @return bool
+     */
+    protected function useRow($hasHeaders, $index)
+    {
+        return ($hasHeaders && $index > 1) || !$hasHeaders;
+    }
 }
\ No newline at end of file
diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php
index 9d427e67c0..4d73653c9f 100644
--- a/app/Helpers/Report/ReportQuery.php
+++ b/app/Helpers/Report/ReportQuery.php
@@ -54,9 +54,7 @@ class ReportQuery implements ReportQueryInterface
             $query->where('transaction_types.type', 'Withdrawal'); // any withdrawal is fine.
         }
         $query->orderBy('transaction_journals.date');
-
-        // get everything
-        $data = $query->get(
+        $data = $query->get( // get everything
             ['transaction_journals.*', 'transaction_types.type', 'ac_to.name as name', 'ac_to.id as account_id', 'ac_to.encrypted as account_encrypted']
         );
 
diff --git a/app/Repositories/Shared/ComponentRepository.php b/app/Repositories/Shared/ComponentRepository.php
index e4187f9e58..c97019880a 100644
--- a/app/Repositories/Shared/ComponentRepository.php
+++ b/app/Repositories/Shared/ComponentRepository.php
@@ -26,9 +26,7 @@ class ComponentRepository
      */
     protected function spentInPeriod($object, Carbon $start, Carbon $end, $shared = false)
     {
-        // we must cache this.
-
-        $cache = new CacheProperties;
+        $cache = new CacheProperties; // we must cache this.
         $cache->addProperty($object->id);
         $cache->addProperty(get_class($object));
         $cache->addProperty($start);
@@ -40,21 +38,13 @@ class ComponentRepository
             return $cache->get(); // @codeCoverageIgnore
         }
 
-
-        if ($shared === true) {
-            // shared is true.
-            // always ignore transfers between accounts!
-            $sum
-                = $object->transactionjournals()
-                         ->transactionTypes(['Withdrawal'])
-                         ->before($end)->after($start)->get(['transaction_journals.*'])->sum('amount');
-
+        if ($shared === true) { // shared is true: always ignore transfers between accounts!
+            $sum = $object->transactionjournals()->transactionTypes(['Withdrawal'])->before($end)->after($start)
+                          ->get(['transaction_journals.*'])->sum('amount');
         } else {
             // do something else, SEE budgets.
             // get all journals in this month where the asset account is NOT shared.
-            $sum = $object->transactionjournals()
-                          ->before($end)
-                          ->after($start)
+            $sum = $object->transactionjournals()->before($end)->after($start)
                           ->transactionTypes(['Withdrawal'])
                           ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                           ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
@@ -62,9 +52,7 @@ class ComponentRepository
                               'account_meta', function (JoinClause $join) {
                               $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
                           }
-                          )
-                          ->where('account_meta.data', '!=', '"sharedAsset"')
-                          ->get(['transaction_journals.*'])->sum('amount');
+                          )->where('account_meta.data', '!=', '"sharedAsset"')->get(['transaction_journals.*'])->sum('amount');
         }
 
         $cache->store($sum);