diff --git a/app/models/Account.php b/app/models/Account.php
index 45fc7fd840..0c056a702b 100644
--- a/app/models/Account.php
+++ b/app/models/Account.php
@@ -5,17 +5,17 @@ use LaravelBook\Ardent\Builder;
 /**
  * Account
  *
- * @property integer                                                      $id
- * @property \Carbon\Carbon                                               $created_at
- * @property \Carbon\Carbon                                               $updated_at
- * @property integer                                                      $user_id
- * @property integer                                                      $account_type_id
- * @property string                                                       $name
- * @property boolean                                                      $active
- * @property-read \AccountType                                            $accountType
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $user_id
+ * @property integer $account_type_id
+ * @property string $name
+ * @property boolean $active
+ * @property-read \AccountType $accountType
  * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
- * @property-read \Illuminate\Database\Eloquent\Collection|\Piggybank[]   $piggybanks
- * @property-read \User                                                   $user
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Piggybank[] $piggybanks
+ * @property-read \User $user
  * @method static \Illuminate\Database\Query\Builder|\Account whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\Account whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\Account whereUpdatedAt($value)
diff --git a/app/models/AccountType.php b/app/models/AccountType.php
index 6053be1047..bdffe1b2fc 100644
--- a/app/models/AccountType.php
+++ b/app/models/AccountType.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * AccountType
  *
diff --git a/app/models/Budget.php b/app/models/Budget.php
index fa2c4ee518..41d1c7eaac 100644
--- a/app/models/Budget.php
+++ b/app/models/Budget.php
@@ -3,16 +3,16 @@
 /**
  * Budget
  *
- * @property integer                                                             $id
- * @property \Carbon\Carbon                                                      $created_at
- * @property \Carbon\Carbon                                                      $updated_at
- * @property string                                                              $name
- * @property integer                                                             $user_id
- * @property string                                                              $class
- * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[]              $limits
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $name
+ * @property integer $user_id
+ * @property string $class
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[] $limits
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[]        $transactions
- * @property-read \User                                                          $user
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @property-read \User $user
  * @method static \Illuminate\Database\Query\Builder|\Budget whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\Budget whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\Budget whereUpdatedAt($value)
diff --git a/app/models/Category.php b/app/models/Category.php
index c39e0642f6..c09c00e60a 100644
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -3,16 +3,16 @@
 /**
  * Category
  *
- * @property integer                                                             $id
- * @property \Carbon\Carbon                                                      $created_at
- * @property \Carbon\Carbon                                                      $updated_at
- * @property string                                                              $name
- * @property integer                                                             $user_id
- * @property string                                                              $class
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $name
+ * @property integer $user_id
+ * @property string $class
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[]              $limits
- * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[]        $transactions
- * @property-read \User                                                          $user
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[] $limits
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @property-read \User $user
  * @method static \Illuminate\Database\Query\Builder|\Category whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\Category whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\Category whereUpdatedAt($value)
diff --git a/app/models/Component.php b/app/models/Component.php
index e1391bbcef..1d325b7a64 100644
--- a/app/models/Component.php
+++ b/app/models/Component.php
@@ -4,16 +4,16 @@ use Firefly\Database\SingleTableInheritanceEntity;
 /**
  * Component
  *
- * @property integer                                                             $id
- * @property \Carbon\Carbon                                                      $created_at
- * @property \Carbon\Carbon                                                      $updated_at
- * @property string                                                              $name
- * @property integer                                                             $user_id
- * @property string                                                              $class
- * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[]              $limits
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $name
+ * @property integer $user_id
+ * @property string $class
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Limit[] $limits
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[]        $transactions
- * @property-read \User                                                          $user
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
+ * @property-read \User $user
  * @method static \Illuminate\Database\Query\Builder|\Component whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\Component whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\Component whereUpdatedAt($value)
diff --git a/app/models/Limit.php b/app/models/Limit.php
index 44236d815f..5c11896933 100644
--- a/app/models/Limit.php
+++ b/app/models/Limit.php
@@ -7,16 +7,16 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
  * Limit
  *
- * @property integer                                                          $id
- * @property \Carbon\Carbon                                                   $created_at
- * @property \Carbon\Carbon                                                   $updated_at
- * @property integer                                                          $component_id
- * @property \Carbon\Carbon                                                   $startdate
- * @property float                                                            $amount
- * @property boolean                                                          $repeats
- * @property string                                                           $repeat_freq
- * @property-read \Budget                                                     $budget
- * @property-read \Component                                                  $component
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $component_id
+ * @property \Carbon\Carbon $startdate
+ * @property float $amount
+ * @property boolean $repeats
+ * @property string $repeat_freq
+ * @property-read \Budget $budget
+ * @property-read \Component $component
  * @property-read \Illuminate\Database\Eloquent\Collection|\LimitRepetition[] $limitrepetitions
  * @method static \Illuminate\Database\Query\Builder|\Limit whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\Limit whereCreatedAt($value)
diff --git a/app/models/LimitRepetition.php b/app/models/LimitRepetition.php
index 3ce5871432..c44ec99b06 100644
--- a/app/models/LimitRepetition.php
+++ b/app/models/LimitRepetition.php
@@ -5,14 +5,14 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
  * LimitRepetition
  *
- * @property integer        $id
+ * @property integer $id
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
- * @property integer        $limit_id
+ * @property integer $limit_id
  * @property \Carbon\Carbon $startdate
  * @property \Carbon\Carbon $enddate
- * @property float          $amount
- * @property-read \Limit    $limit
+ * @property float $amount
+ * @property-read \Limit $limit
  * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\LimitRepetition whereUpdatedAt($value)
diff --git a/app/models/Piggybank.php b/app/models/Piggybank.php
index aa59363ba9..5c54acc7b8 100644
--- a/app/models/Piggybank.php
+++ b/app/models/Piggybank.php
@@ -5,25 +5,26 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
  * Piggybank
  *
- * @property integer                                                              $id
- * @property \Carbon\Carbon                                                       $created_at
- * @property \Carbon\Carbon                                                       $updated_at
- * @property integer                                                              $account_id
- * @property string                                                               $name
- * @property float                                                                $targetamount
- * @property \Carbon\Carbon                                                       $startdate
- * @property \Carbon\Carbon                                                       $targetdate
- * @property boolean                                                              $repeats
- * @property string                                                               $rep_length
- * @property integer                                                              $rep_every
- * @property integer                                                              $rep_times
- * @property string                                                               $reminder
- * @property integer                                                              $reminder_skip
- * @property integer                                                              $order
- * @property-read \Account                                                        $account
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $account_id
+ * @property string $name
+ * @property float $targetamount
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $targetdate
+ * @property boolean $repeats
+ * @property string $rep_length
+ * @property integer $rep_every
+ * @property integer $rep_times
+ * @property string $reminder
+ * @property integer $reminder_skip
+ * @property integer $order
+ * @property-read \Account $account
  * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankRepetition[] $piggybankrepetitions
- * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankEvent[]      $piggybankevents
- * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[]         $transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankEvent[] $piggybankevents
+ * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankReminder[] $piggybankreminders
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
  * @method static \Illuminate\Database\Query\Builder|\Piggybank whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\Piggybank whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\Piggybank whereUpdatedAt($value)
@@ -39,7 +40,6 @@ use LaravelBook\Ardent\Ardent as Ardent;
  * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminder($value)
  * @method static \Illuminate\Database\Query\Builder|\Piggybank whereReminderSkip($value)
  * @method static \Illuminate\Database\Query\Builder|\Piggybank whereOrder($value)
- * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankReminder[] $piggybankreminders
  */
 class Piggybank extends Ardent
 {
diff --git a/app/models/PiggybankEvent.php b/app/models/PiggybankEvent.php
index 244b1b4032..32bcde3a71 100644
--- a/app/models/PiggybankEvent.php
+++ b/app/models/PiggybankEvent.php
@@ -5,12 +5,12 @@ use LaravelBook\Ardent\Ardent as Ardent;
 /**
  * PiggybankEvent
  *
- * @property integer         $id
- * @property \Carbon\Carbon  $created_at
- * @property \Carbon\Carbon  $updated_at
- * @property integer         $piggybank_id
- * @property \Carbon\Carbon  $date
- * @property float           $amount
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $piggybank_id
+ * @property \Carbon\Carbon $date
+ * @property float $amount
  * @property-read \Piggybank $piggybank
  * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\PiggybankEvent whereCreatedAt($value)
diff --git a/app/models/PiggybankReminder.php b/app/models/PiggybankReminder.php
index 92d6604480..3ad6eb7547 100644
--- a/app/models/PiggybankReminder.php
+++ b/app/models/PiggybankReminder.php
@@ -2,7 +2,7 @@
 use Carbon\Carbon;
 
 /**
- * Class PiggybankReminder
+ * PiggybankReminder
  *
  * @property integer $id
  * @property \Carbon\Carbon $created_at
diff --git a/app/models/PiggybankRepetition.php b/app/models/PiggybankRepetition.php
index ead16ef84a..254abad2c5 100644
--- a/app/models/PiggybankRepetition.php
+++ b/app/models/PiggybankRepetition.php
@@ -1,17 +1,16 @@
 <?php
 use LaravelBook\Ardent\Ardent as Ardent;
 
-
 /**
  * PiggybankRepetition
  *
- * @property integer         $id
- * @property \Carbon\Carbon  $created_at
- * @property \Carbon\Carbon  $updated_at
- * @property integer         $piggybank_id
- * @property \Carbon\Carbon  $startdate
- * @property \Carbon\Carbon  $targetdate
- * @property float           $currentamount
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $piggybank_id
+ * @property \Carbon\Carbon $startdate
+ * @property \Carbon\Carbon $targetdate
+ * @property float $currentamount
  * @property-read \Piggybank $piggybank
  * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereCreatedAt($value)
diff --git a/app/models/Preference.php b/app/models/Preference.php
index abeeb15f7b..cd5f879ed3 100644
--- a/app/models/Preference.php
+++ b/app/models/Preference.php
@@ -2,17 +2,16 @@
 
 use LaravelBook\Ardent\Ardent;
 
-
 /**
  * Preference
  *
- * @property integer        $id
+ * @property integer $id
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
- * @property integer        $user_id
- * @property string         $name
- * @property string         $data
- * @property-read \User     $user
+ * @property integer $user_id
+ * @property string $name
+ * @property string $data
+ * @property-read \User $user
  * @method static \Illuminate\Database\Query\Builder|\Preference whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\Preference whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\Preference whereUpdatedAt($value)
diff --git a/app/models/RecurringTransaction.php b/app/models/RecurringTransaction.php
index 208f693784..4a829f73e8 100644
--- a/app/models/RecurringTransaction.php
+++ b/app/models/RecurringTransaction.php
@@ -5,20 +5,21 @@ use LaravelBook\Ardent\Ardent;
 /**
  * RecurringTransaction
  *
- * @property integer        $id
+ * @property integer $id
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
- * @property integer        $user_id
- * @property string         $name
- * @property string         $match
- * @property float          $amount_max
- * @property float          $amount_min
+ * @property integer $user_id
+ * @property string $name
+ * @property string $match
+ * @property float $amount_max
+ * @property float $amount_min
  * @property \Carbon\Carbon $date
- * @property boolean        $active
- * @property boolean        $automatch
- * @property string         $repeat_freq
- * @property integer        $skip
- * @property-read \User     $user
+ * @property boolean $active
+ * @property boolean $automatch
+ * @property string $repeat_freq
+ * @property integer $skip
+ * @property-read \Illuminate\Database\Eloquent\Collection|\RecurringTransactionReminder[] $reminders
+ * @property-read \User $user
  * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereUpdatedAt($value)
@@ -32,7 +33,6 @@ use LaravelBook\Ardent\Ardent;
  * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereAutomatch($value)
  * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereRepeatFreq($value)
  * @method static \Illuminate\Database\Query\Builder|\RecurringTransaction whereSkip($value)
- * @property-read \Illuminate\Database\Eloquent\Collection|\RecurringTransactionReminder[] $reminders
  */
 class RecurringTransaction extends Ardent
 {
diff --git a/app/models/RecurringTransactionReminder.php b/app/models/RecurringTransactionReminder.php
index 4d5b52fc14..8d66a45296 100644
--- a/app/models/RecurringTransactionReminder.php
+++ b/app/models/RecurringTransactionReminder.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Class RecurringTransactionReminder
+ * RecurringTransactionReminder
  *
  * @property integer $id
  * @property \Carbon\Carbon $created_at
diff --git a/app/models/Reminder.php b/app/models/Reminder.php
index be6e28b351..d720bb3fec 100644
--- a/app/models/Reminder.php
+++ b/app/models/Reminder.php
@@ -3,10 +3,8 @@
 use Carbon\Carbon;
 use Firefly\Database\SingleTableInheritanceEntity;
 
-
 /**
- * Class Reminder
- *     // reminder for: recurring, piggybank.
+ * Reminder
  *
  * @property integer $id
  * @property \Carbon\Carbon $created_at
diff --git a/app/models/TransactionCurrency.php b/app/models/TransactionCurrency.php
index 1e8648c46d..72aca6472e 100644
--- a/app/models/TransactionCurrency.php
+++ b/app/models/TransactionCurrency.php
@@ -3,10 +3,10 @@
 /**
  * TransactionCurrency
  *
- * @property integer                                                             $id
- * @property \Carbon\Carbon                                                      $created_at
- * @property \Carbon\Carbon                                                      $updated_at
- * @property string                                                              $code
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $code
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
  * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\TransactionCurrency whereCreatedAt($value)
diff --git a/app/models/TransactionJournal.php b/app/models/TransactionJournal.php
index 960cd76c5c..ced3529c4f 100644
--- a/app/models/TransactionJournal.php
+++ b/app/models/TransactionJournal.php
@@ -4,28 +4,27 @@ use Carbon\Carbon;
 use LaravelBook\Ardent\Ardent;
 use LaravelBook\Ardent\Builder;
 
-
 /**
  * TransactionJournal
  *
- * @property integer                                                      $id
- * @property Carbon                                                       $created_at
- * @property Carbon                                                       $updated_at
- * @property integer                                                      $user_id
- * @property integer                                                      $transaction_type_id
- * @property integer                                                      $transaction_currency_id
- * @property string                                                       $description
- * @property boolean                                                      $completed
- * @property Carbon                                                       $date
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property integer $user_id
+ * @property integer $transaction_type_id
+ * @property integer $transaction_currency_id
+ * @property string $description
+ * @property boolean $completed
+ * @property \Carbon\Carbon $date
  * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Budget[] $budgets
+ *                     'Budget[] $budgets
  * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Category[] $categories
- * @property-read \Illuminate\Database\Eloquent\Collection|\Component[]   $components
- * @property-read \TransactionCurrency                                    $transactionCurrency
- * @property-read \TransactionType                                        $transactionType
+ *                     'Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Component[] $components
+ * @property-read \TransactionCurrency $transactionCurrency
+ * @property-read \TransactionType $transactionType
  * @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
- * @property-read \User                                                   $user
+ * @property-read \User $user
  * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereUpdatedAt($value)
@@ -35,35 +34,15 @@ use LaravelBook\Ardent\Builder;
  * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDescription($value)
  * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereCompleted($value)
  * @method static \Illuminate\Database\Query\Builder|\TransactionJournal whereDate($value)
+ * @method static \TransactionJournal account($account)
  * @method static \TransactionJournal after($date)
  * @method static \TransactionJournal before($date)
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Budget[] $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Category[] $categories
- * @method static \TransactionJournal onDate($date)
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Budget[] $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Category[] $categories
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Budget[] $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Category[] $categories
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Budget[] $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *             'Category[] $categories
  * @method static \TransactionJournal defaultSorting()
- * @method static \TransactionJournal withRelevantData()
- * @method static \TransactionJournal account($account)
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *                     'Budget[] $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\
- *                     'Category[] $categories
  * @method static \TransactionJournal moreThan($amount)
  * @method static \TransactionJournal lessThan($amount)
+ * @method static \TransactionJournal onDate($date)
  * @method static \TransactionJournal transactionTypes($types)
+ * @method static \TransactionJournal withRelevantData()
  * @property-read \Illuminate\Database\Eloquent\Collection|\
  *                     'Budget[] $budgets
  * @property-read \Illuminate\Database\Eloquent\Collection|\
diff --git a/app/models/TransactionType.php b/app/models/TransactionType.php
index 0fea66cadd..348e0ceef9 100644
--- a/app/models/TransactionType.php
+++ b/app/models/TransactionType.php
@@ -5,10 +5,10 @@ use LaravelBook\Ardent\Ardent;
 /**
  * TransactionType
  *
- * @property integer                                                             $id
- * @property \Carbon\Carbon                                                      $created_at
- * @property \Carbon\Carbon                                                      $updated_at
- * @property string                                                              $type
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $type
  * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionJournals
  * @method static \Illuminate\Database\Query\Builder|\TransactionType whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\TransactionType whereCreatedAt($value)
diff --git a/app/models/User.php b/app/models/User.php
index 70c7f7ee12..601e182517 100644
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -10,21 +10,23 @@ use LaravelBook\Ardent\Ardent;
 /**
  * User
  *
- * @property integer                                                               $id
- * @property \Carbon\Carbon                                                        $created_at
- * @property \Carbon\Carbon                                                        $updated_at
- * @property string                                                                $email
- * @property string                                                                $password
- * @property string                                                                $reset
- * @property string                                                                $remember_token
- * @property boolean                                                               $migrated
- * @property-read \Illuminate\Database\Eloquent\Collection|\Account[]              $accounts
- * @property-read \Illuminate\Database\Eloquent\Collection|\Budget[]               $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\Category[]             $categories
- * @property-read \Illuminate\Database\Eloquent\Collection|\Component[]            $components
- * @property-read \Illuminate\Database\Eloquent\Collection|\Preference[]           $preferences
+ * @property integer $id
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $email
+ * @property string $password
+ * @property string $reset
+ * @property string $remember_token
+ * @property boolean $migrated
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Account[] $accounts
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Budget[] $budgets
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Reminder[] $reminders
+ * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankReminder[] $piggybankreminders
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Category[] $categories
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Component[] $components
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Preference[] $preferences
  * @property-read \Illuminate\Database\Eloquent\Collection|\RecurringTransaction[] $recurringtransactions
- * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[]   $transactionjournals
+ * @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
  * @method static \Illuminate\Database\Query\Builder|\User whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\User whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\User whereUpdatedAt($value)
@@ -33,8 +35,6 @@ use LaravelBook\Ardent\Ardent;
  * @method static \Illuminate\Database\Query\Builder|\User whereReset($value)
  * @method static \Illuminate\Database\Query\Builder|\User whereRememberToken($value)
  * @method static \Illuminate\Database\Query\Builder|\User whereMigrated($value)
- * @property-read \Illuminate\Database\Eloquent\Collection|\Reminder[] $reminders
- * @property-read \Illuminate\Database\Eloquent\Collection|\PiggybankReminder[] $piggybankreminders
  */
 class User extends Ardent implements UserInterface, RemindableInterface
 {