diff --git a/app/Events/Event.php b/app/Events/Event.php
index f312a916..811ab6ea 100644
--- a/app/Events/Event.php
+++ b/app/Events/Event.php
@@ -2,10 +2,10 @@
 
 namespace App\Events;
 
-use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Queue\SerializesModels;
 
 class Event
 {
diff --git a/app/Events/UserEmailChanged.php b/app/Events/UserEmailChanged.php
index f6a5ba7e..a9be9de3 100644
--- a/app/Events/UserEmailChanged.php
+++ b/app/Events/UserEmailChanged.php
@@ -4,7 +4,6 @@
 
 use App\User;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Http/Controllers/Api/MailAddressesController.php b/app/Http/Controllers/Api/MailAddressesController.php
index 315e9900..4188c3c6 100644
--- a/app/Http/Controllers/Api/MailAddressesController.php
+++ b/app/Http/Controllers/Api/MailAddressesController.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Role;
 use App\User;
-use App\Http\Controllers\Controller;
 
 class MailAddressesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/MailAttachmentsController.php b/app/Http/Controllers/Api/MailAttachmentsController.php
index 513eec8e..28783ce7 100644
--- a/app/Http/Controllers/Api/MailAttachmentsController.php
+++ b/app/Http/Controllers/Api/MailAttachmentsController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
-use Storage;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Storage;
 
 class MailAttachmentsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/MailGroupController.php b/app/Http/Controllers/Api/MailGroupController.php
index 1c6864de..fd3e604c 100644
--- a/app/Http/Controllers/Api/MailGroupController.php
+++ b/app/Http/Controllers/Api/MailGroupController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Role;
 use App\User;
 use Illuminate\Support\Collection;
-use App\Http\Controllers\Controller;
 
 class MailGroupController extends Controller
 {
diff --git a/app/Http/Controllers/Api/PluginsController.php b/app/Http/Controllers/Api/PluginsController.php
index c546429b..a956d42f 100644
--- a/app/Http/Controllers/Api/PluginsController.php
+++ b/app/Http/Controllers/Api/PluginsController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api;
 
-use Gerpo\Plugisto\Models\Plugisto;
 use App\Http\Controllers\Controller;
+use Gerpo\Plugisto\Models\Plugisto;
 use Gerpo\Plugisto\Scopes\ActiveScope;
 
 class PluginsController extends Controller
diff --git a/app/Http/Controllers/Api/RegisterConfirmationController.php b/app/Http/Controllers/Api/RegisterConfirmationController.php
index 4ccd0d4e..c2f88dfb 100644
--- a/app/Http/Controllers/Api/RegisterConfirmationController.php
+++ b/app/Http/Controllers/Api/RegisterConfirmationController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\User;
 use App\Http\Controllers\Controller;
+use App\User;
 
 class RegisterConfirmationController extends Controller
 {
diff --git a/app/Http/Controllers/Api/RoleAbilitiesController.php b/app/Http/Controllers/Api/RoleAbilitiesController.php
index 138d21cd..0faaccf0 100644
--- a/app/Http/Controllers/Api/RoleAbilitiesController.php
+++ b/app/Http/Controllers/Api/RoleAbilitiesController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Role;
 use App\Http\Controllers\Controller;
+use App\Role;
 
 class RoleAbilitiesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/RolesController.php b/app/Http/Controllers/Api/RolesController.php
index 9a7b59f7..8aa8debb 100644
--- a/app/Http/Controllers/Api/RolesController.php
+++ b/app/Http/Controllers/Api/RolesController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
-use Bouncer;
+use App\Http\Controllers\Controller;
 use App\Role;
+use Bouncer;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 
 class RolesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/UserEmailController.php b/app/Http/Controllers/Api/UserEmailController.php
index b5a73230..dbc95d83 100644
--- a/app/Http/Controllers/Api/UserEmailController.php
+++ b/app/Http/Controllers/Api/UserEmailController.php
@@ -10,7 +10,7 @@ class UserEmailController extends Controller
     public function update(User $user)
     {
         $data = request()->validate([
-            'new-email' => 'required|string|email|max:255|unique:users,email'
+            'new-email' => 'required|string|email|max:255|unique:users,email',
         ]);
 
         $user->email = $data['new-email'];
diff --git a/app/Http/Controllers/Api/UserPasswordController.php b/app/Http/Controllers/Api/UserPasswordController.php
index f6df66d0..6a5d06de 100644
--- a/app/Http/Controllers/Api/UserPasswordController.php
+++ b/app/Http/Controllers/Api/UserPasswordController.php
@@ -10,8 +10,8 @@ class UserPasswordController extends Controller
 {
     public function update(User $user): void
     {
-        $data= request()->validate([
-            'new-password' => 'required|string|min:6|confirmed'
+        $data = request()->validate([
+            'new-password' => 'required|string|min:6|confirmed',
         ]);
 
         $user->password = Hash::make($data['new-password']);
diff --git a/app/Http/Controllers/Api/UserRolesController.php b/app/Http/Controllers/Api/UserRolesController.php
index e3c8d71e..efb4e49b 100644
--- a/app/Http/Controllers/Api/UserRolesController.php
+++ b/app/Http/Controllers/Api/UserRolesController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\User;
 use App\Http\Controllers\Controller;
+use App\User;
 
 class UserRolesController extends Controller
 {
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 7f88f099..941db4eb 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -2,9 +2,8 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Scopes\ActiveScope;
-use App\User;
 use App\Http\Controllers\Controller;
+use App\User;
 
 class UsersController extends Controller
 {
@@ -20,7 +19,7 @@ public function index()
         $query = $this->buildResidentFilterQuery($residentFilter);
 
         $users = $query->whereNotIn('house', $dorms)
-            ->where(function ($subQuery) use ($filter, $orderColumn, $order) {
+            ->where(function ($subQuery) use ($filter) {
                 $subQuery->where('email', 'LIKE', $filter)
                     ->orWhere('firstname', 'LIKE', $filter)
                     ->orWhere('lastname', 'LIKE', $filter)
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 0ec74325..6dec9ffe 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,16 +2,16 @@
 
 namespace App\Http\Controllers\Auth;
 
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Support\Str;
-use Mail;
+use App\Http\Controllers\Controller;
+use App\Mail\ConfirmEmailMail;
 use App\User;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
-use App\Mail\ConfirmEmailMail;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Str;
+use Mail;
 
 class RegisterController extends Controller
 {
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 03e02a23..a0a2a8a3 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index a6909491..531a44bb 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -23,7 +23,7 @@ public function __construct()
     public function index()
     {
         $packages = Auth::user()->packages();
-        $notifications = Notification::where('published_at','!=' , null)->get();
+        $notifications = Notification::where('published_at', '!=', null)->get();
 
         return view('home', compact('packages', 'notifications'));
     }
diff --git a/app/Http/Controllers/MailsController.php b/app/Http/Controllers/MailsController.php
index 39940084..3c32c56d 100644
--- a/app/Http/Controllers/MailsController.php
+++ b/app/Http/Controllers/MailsController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use Mail;
+use App\Jobs\SendGroupMail;
+use App\Mail\RegularMail;
 use App\Role;
 use App\User;
-use App\Mail\RegularMail;
-use App\Jobs\SendGroupMail;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
+use Mail;
 
 class MailsController extends Controller
 {
diff --git a/app/Http/Controllers/NotificationsController.php b/app/Http/Controllers/NotificationsController.php
index 236a2aa6..31424ed7 100644
--- a/app/Http/Controllers/NotificationsController.php
+++ b/app/Http/Controllers/NotificationsController.php
@@ -12,6 +12,7 @@ class NotificationsController extends Controller
     public function index()
     {
         $notifications = Notification::with('creator')->get();
+
         return view('notifications')->with(compact('notifications'));
     }
 
@@ -21,7 +22,7 @@ public function store(Request $request)
         $data = $request->validate([
             'title' => 'string|nullable',
             'message' => 'required|string',
-            'is_active' => 'boolean'
+            'is_active' => 'boolean',
         ]);
         $notification = Notification::make($data);
         $request->user()->notifications()->save($notification);
@@ -47,10 +48,11 @@ private function sendMailToAll($subject, $message): void
     public function update(Notification $notification)
     {
         $data = request()->validate([
-            'is_active' => 'required|boolean'
+            'is_active' => 'required|boolean',
         ]);
 
         $notification->publish($data['is_active']);
+
         return $notification->fresh();
     }
 
diff --git a/app/Http/Controllers/RolePosterController.php b/app/Http/Controllers/RolePosterController.php
index 64fae65e..98bd0e85 100644
--- a/app/Http/Controllers/RolePosterController.php
+++ b/app/Http/Controllers/RolePosterController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use PDF;
 use App\Role;
+use PDF;
 
 class RolePosterController extends Controller
 {
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index f85d15b3..cfaf4a9e 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -16,6 +16,7 @@ public function index()
     public function show(User $user)
     {
         $user->load(['roles'])->append('permissions');
+
         return view('profile')->with(['user' => $user]);
     }
 }
diff --git a/app/Http/Middleware/HideInactivePlugistoRoutes.php b/app/Http/Middleware/HideInactivePlugistoRoutes.php
index f898085c..bb7bb704 100644
--- a/app/Http/Middleware/HideInactivePlugistoRoutes.php
+++ b/app/Http/Middleware/HideInactivePlugistoRoutes.php
@@ -20,7 +20,7 @@ public function handle($request, Closure $next)
         $baseUri = explode('/', $request->path())[0];
         if (Plugisto::withoutGlobalScope(ActiveScope::class)->where([
             'route' => "/{$baseUri}",
-            'is_active' => false
+            'is_active' => false,
         ])->get()->isNotEmpty()) {
             abort(404);
         }
diff --git a/app/Http/Middleware/RedirectIfConfirmed.php b/app/Http/Middleware/RedirectIfConfirmed.php
index 72907c63..791962c1 100644
--- a/app/Http/Middleware/RedirectIfConfirmed.php
+++ b/app/Http/Middleware/RedirectIfConfirmed.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace App\Http\Middleware;
 
-
 use Auth;
 use Closure;
 
diff --git a/app/Http/Middleware/RedirectIfUnconfirmed.php b/app/Http/Middleware/RedirectIfUnconfirmed.php
index 15ab9204..4c3098bf 100644
--- a/app/Http/Middleware/RedirectIfUnconfirmed.php
+++ b/app/Http/Middleware/RedirectIfUnconfirmed.php
@@ -16,7 +16,7 @@ class RedirectIfUnconfirmed
      */
     public function handle($request, Closure $next)
     {
-        if (!Auth::user()->confirmed) {
+        if (! Auth::user()->confirmed) {
             return redirect('/verify');
         }
 
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 3ce02144..d88a69d7 100644
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
diff --git a/app/Jobs/SendGroupMail.php b/app/Jobs/SendGroupMail.php
index bb23e5d6..95a92ba9 100644
--- a/app/Jobs/SendGroupMail.php
+++ b/app/Jobs/SendGroupMail.php
@@ -2,13 +2,13 @@
 
 namespace App\Jobs;
 
-use Mail;
 use App\Mail\RegularMail;
 use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Mail;
 
 class SendGroupMail implements ShouldQueue
 {
diff --git a/app/Listeners/SendEmailConfirmationEmail.php b/app/Listeners/SendEmailConfirmationEmail.php
index 654d8485..5a28f2ad 100644
--- a/app/Listeners/SendEmailConfirmationEmail.php
+++ b/app/Listeners/SendEmailConfirmationEmail.php
@@ -4,8 +4,6 @@
 
 use App\Events\UserEmailChanged;
 use App\Mail\ConfirmEmailMail;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Mail;
 
 class SendEmailConfirmationEmail
diff --git a/app/Mail/ConfirmEmailMail.php b/app/Mail/ConfirmEmailMail.php
index 106ca4b2..422ff83b 100644
--- a/app/Mail/ConfirmEmailMail.php
+++ b/app/Mail/ConfirmEmailMail.php
@@ -4,9 +4,9 @@
 
 use App\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class ConfirmEmailMail extends Mailable implements ShouldQueue
 {
diff --git a/app/Mail/NotificationMail.php b/app/Mail/NotificationMail.php
index cb25a4a9..cef3af98 100644
--- a/app/Mail/NotificationMail.php
+++ b/app/Mail/NotificationMail.php
@@ -3,9 +3,9 @@
 namespace App\Mail;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class NotificationMail extends Mailable implements ShouldQueue
 {
diff --git a/app/Mail/RegularMail.php b/app/Mail/RegularMail.php
index b8d738a2..d7aeb7f7 100644
--- a/app/Mail/RegularMail.php
+++ b/app/Mail/RegularMail.php
@@ -2,11 +2,11 @@
 
 namespace App\Mail;
 
-use Storage;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use Storage;
 
 class RegularMail extends Mailable implements ShouldQueue
 {
diff --git a/app/Notification.php b/app/Notification.php
index ef4fe82c..1b2f078e 100644
--- a/app/Notification.php
+++ b/app/Notification.php
@@ -4,7 +4,6 @@
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
-use Parsedown;
 
 class Notification extends Model
 {
@@ -17,7 +16,7 @@ class Notification extends Model
     ];
 
     protected $casts = [
-        'is_active' => 'boolean'
+        'is_active' => 'boolean',
     ];
 
     public static function boot()
@@ -25,7 +24,7 @@ public static function boot()
         parent::boot();
 
         static::saving(function ($notification) {
-            if (!$notification->is_active || $notification->published_at !== null) {
+            if (! $notification->is_active || $notification->published_at !== null) {
                 return;
             }
 
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
index e1513f54..8ff6716f 100644
--- a/app/Observers/UserObserver.php
+++ b/app/Observers/UserObserver.php
@@ -20,7 +20,7 @@ public function created(User $user): void
 
     public function saving(User $user): void
     {
-        $user->full_room = str_pad($user->floor, 2, 0, STR_PAD_LEFT) . str_pad($user->room, 2, 0,
+        $user->full_room = str_pad($user->floor, 2, 0, STR_PAD_LEFT).str_pad($user->room, 2, 0,
                 STR_PAD_LEFT);
     }
 
@@ -28,7 +28,7 @@ public function updating(User $user): void
     {
         if ($user->getOriginal('email') !== $user->email) {
             $user->confirmed = false;
-            $user->confirmation_token = Str::limit(md5($user->email . Str::random()), 25, '');
+            $user->confirmation_token = Str::limit(md5($user->email.Str::random()), 25, '');
             event(new UserEmailChanged($user));
         }
 
@@ -38,5 +38,4 @@ public function updating(User $user): void
             Bouncer::retract('resident')->from($user);
         }
     }
-
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 59dd58a5..3ec8cf4e 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,10 +3,10 @@
 namespace App\Providers;
 
 use App\Observers\UserObserver;
+use App\Role;
 use App\User;
 use Blade;
 use Bouncer;
-use App\Role;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 2541f3f8..dc591395 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
index 352cce44..395c518b 100644
--- a/app/Providers/BroadcastServiceProvider.php
+++ b/app/Providers/BroadcastServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index ebe5b0b0..3290747d 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/TelescopeServiceProvider.php b/app/Providers/TelescopeServiceProvider.php
index fe77f6ca..bc999baa 100644
--- a/app/Providers/TelescopeServiceProvider.php
+++ b/app/Providers/TelescopeServiceProvider.php
@@ -2,9 +2,9 @@
 
 namespace App\Providers;
 
-use Laravel\Telescope\Telescope;
 use Illuminate\Support\Facades\Gate;
 use Laravel\Telescope\IncomingEntry;
+use Laravel\Telescope\Telescope;
 use Laravel\Telescope\TelescopeApplicationServiceProvider;
 
 class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
diff --git a/app/Scopes/ActiveScope.php b/app/Scopes/ActiveScope.php
index 84471208..4b14c928 100644
--- a/app/Scopes/ActiveScope.php
+++ b/app/Scopes/ActiveScope.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace App\Scopes;
 
-
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
@@ -21,4 +19,4 @@ public function apply(Builder $builder, Model $model)
     {
         $builder->where('is_active', true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/User.php b/app/User.php
index 42944d5b..9a95f6dc 100644
--- a/app/User.php
+++ b/app/User.php
@@ -3,10 +3,7 @@
 namespace App;
 
 use App\Scopes\ActiveScope;
-use Gerpo\DmsCredits\Traits\HasCreditAccount;
-use Gerpo\DmsCredits\Traits\UsesCodes;
 use Gerpo\Plugisto\Models\Plugisto;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Str;
@@ -47,7 +44,6 @@ protected static function boot(): void
         static::addGlobalScope(new ActiveScope());
     }
 
-
     public function confirm(): void
     {
         $this->confirmed = true;
diff --git a/composer.lock b/composer.lock
index cf53bdb6..ccaa8a6e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -713,8 +713,8 @@
             "authors": [
                 {
                     "name": "Filipe Dobreira",
-                    "role": "Developer",
-                    "homepage": "https://github.com/filp"
+                    "homepage": "https://github.com/filp",
+                    "role": "Developer"
                 }
             ],
             "description": "php error handling for cool kids",
@@ -816,6 +816,7 @@
                     "email": "jakub.onderka@gmail.com"
                 }
             ],
+            "abandoned": "php-parallel-lint/php-console-color",
             "time": "2018-09-29T17:23:10+00:00"
         },
         {
@@ -862,6 +863,7 @@
                 }
             ],
             "description": "Highlight PHP code in terminal",
+            "abandoned": "php-parallel-lint/php-console-highlighter",
             "time": "2018-09-29T18:48:56+00:00"
         },
         {
@@ -1346,6 +1348,7 @@
                 "bcmath",
                 "math"
             ],
+            "abandoned": "brick/math",
             "time": "2017-02-16T16:54:46+00:00"
         },
         {
@@ -1976,6 +1979,11 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Ben Ramsey",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
+                },
                 {
                     "name": "Marijn Huizendveld",
                     "email": "marijn.huizendveld@gmail.com"
@@ -1983,11 +1991,6 @@
                 {
                     "name": "Thibaud Fabre",
                     "email": "thibaud@aztech.io"
-                },
-                {
-                    "name": "Ben Ramsey",
-                    "email": "ben@benramsey.com",
-                    "homepage": "https://benramsey.com"
                 }
             ],
             "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
@@ -2086,18 +2089,18 @@
             "authors": [
                 {
                     "name": "Geert Bergman",
-                    "role": "Project Author",
-                    "homepage": "http://www.scrivo.org/"
+                    "homepage": "http://www.scrivo.org/",
+                    "role": "Project Author"
                 },
                 {
                     "name": "Vladimir Jimenez",
-                    "role": "Contributor",
-                    "homepage": "https://allejo.io"
+                    "homepage": "https://allejo.io",
+                    "role": "Contributor"
                 },
                 {
                     "name": "Martin Folkers",
-                    "role": "Contributor",
-                    "homepage": "https://twobrain.io"
+                    "homepage": "https://twobrain.io",
+                    "role": "Contributor"
                 }
             ],
             "description": "Server side syntax highlighter that supports 185 languages. It's a PHP port of highlight.js",
@@ -2605,33 +2608,28 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.3.4",
+            "version": "v4.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc"
+                "reference": "827a00811ef699e809a201ceafac0b2b246bf38a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d804bea118ff340a12e22a79f9c7e7eb56b35adc",
-                "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/827a00811ef699e809a201ceafac0b2b246bf38a",
+                "reference": "827a00811ef699e809a201ceafac0b2b246bf38a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/mime": "^4.3",
+                "php": ">=7.1.3",
+                "symfony/mime": "^4.3|^5.0",
                 "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
                 "predis/predis": "~1.0",
-                "symfony/expression-language": "~3.4|~4.0"
+                "symfony/expression-language": "^3.4|^4.0|^5.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\HttpFoundation\\": ""
@@ -2656,7 +2654,21 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T08:55:16+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-24T11:50:19+00:00"
         },
         {
             "name": "symfony/http-kernel",
@@ -2752,33 +2764,32 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v4.3.4",
+            "version": "v5.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "987a05df1c6ac259b34008b932551353f4f408df"
+                "reference": "f5485a92c24d4bcfc2f3fc648744fb398482ff1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df",
-                "reference": "987a05df1c6ac259b34008b932551353f4f408df",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/f5485a92c24d4bcfc2f3fc648744fb398482ff1b",
+                "reference": "f5485a92c24d4bcfc2f3fc648744fb398482ff1b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.2.5",
                 "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0"
+                "symfony/polyfill-mbstring": "^1.0",
+                "symfony/polyfill-php80": "^1.15"
+            },
+            "conflict": {
+                "symfony/mailer": "<4.4"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10",
-                "symfony/dependency-injection": "~3.4|^4.1"
+                "symfony/dependency-injection": "^4.4|^5.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Mime\\": ""
@@ -2807,7 +2818,21 @@
                 "mime",
                 "mime-type"
             ],
-            "time": "2019-08-22T08:16:11+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-24T12:01:57+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2928,22 +2953,22 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.12.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2"
+                "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
-                "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117",
+                "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php72": "^1.9"
+                "php": ">=7.1",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -2951,7 +2976,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -2971,6 +3000,10 @@
                     "name": "Laurent Bassin",
                     "email": "laurent@bassin.info"
                 },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
@@ -2986,24 +3019,119 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T14:02:19+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.20.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "727d1096295d807c309fb01a851577302394c897"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897",
+                "reference": "727d1096295d807c309fb01a851577302394c897",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T14:02:19+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.12.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
+                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
@@ -3011,7 +3139,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3045,29 +3177,47 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T14:02:19+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.12.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "04ce3335667451138df4307d6a9b61565560199e"
+                "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
-                "reference": "04ce3335667451138df4307d6a9b61565560199e",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930",
+                "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3100,7 +3250,21 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T14:02:19+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
@@ -3160,6 +3324,86 @@
             ],
             "time": "2019-08-06T08:03:45+00:00"
         },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.20.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
+                "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T14:02:19+00:00"
+        },
         {
             "name": "symfony/process",
             "version": "v4.3.4",
@@ -3557,12 +3801,12 @@
             "version": "v0.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/tightenco/ziggy.git",
+                "url": "https://github.com/tighten/ziggy.git",
                 "reference": "f169e46073a478170d3f687d644bea5f316dfb5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tightenco/ziggy/zipball/f169e46073a478170d3f687d644bea5f316dfb5d",
+                "url": "https://api.github.com/repos/tighten/ziggy/zipball/f169e46073a478170d3f687d644bea5f316dfb5d",
                 "reference": "f169e46073a478170d3f687d644bea5f316dfb5d",
                 "shasum": ""
             },
@@ -4524,6 +4768,7 @@
                 "laravel",
                 "vue-i18n"
             ],
+            "abandoned": true,
             "time": "2019-09-03T16:59:43+00:00"
         },
         {
@@ -5070,8 +5315,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "lead",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
             "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@@ -5270,6 +5515,7 @@
             "keywords": [
                 "tokenizer"
             ],
+            "abandoned": true,
             "time": "2019-07-25T05:29:42+00:00"
         },
         {
@@ -6474,5 +6720,6 @@
         "php": ">=7.3.0",
         "ext-json": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }
diff --git a/config/telescope.php b/config/telescope.php
index 60e985f4..ebf1ca38 100644
--- a/config/telescope.php
+++ b/config/telescope.php
@@ -1,7 +1,7 @@
 <?php
 
-use Laravel\Telescope\Watchers;
 use Laravel\Telescope\Http\Middleware\Authorize;
+use Laravel\Telescope\Watchers;
 
 return [
 
diff --git a/database/factories/NotifiationFactory.php b/database/factories/NotifiationFactory.php
index 3b29ee15..2a6d4b7a 100644
--- a/database/factories/NotifiationFactory.php
+++ b/database/factories/NotifiationFactory.php
@@ -1,6 +1,5 @@
 <?php
 
-
 use App\User;
 use Faker\Generator as Faker;
 
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index f2264f6a..4a611587 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index 0d5cb845..0ee0a36a 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreatePasswordResetsTable extends Migration
 {
diff --git a/database/migrations/2019_06_26_181221_create_bouncer_tables.php b/database/migrations/2019_06_26_181221_create_bouncer_tables.php
index 0d242ae1..a5fd3d37 100644
--- a/database/migrations/2019_06_26_181221_create_bouncer_tables.php
+++ b/database/migrations/2019_06_26_181221_create_bouncer_tables.php
@@ -1,10 +1,9 @@
 <?php
 
-use Silber\Bouncer\Database\Models;
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Silber\Bouncer\Database\Models;
 
 class CreateBouncerTables extends Migration
 {
diff --git a/database/seeds/PlugistoTableSeeder.php b/database/seeds/PlugistoTableSeeder.php
index 48d8b718..7b6cf4bb 100644
--- a/database/seeds/PlugistoTableSeeder.php
+++ b/database/seeds/PlugistoTableSeeder.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Seeder;
 use Gerpo\Plugisto\Models\Plugisto;
+use Illuminate\Database\Seeder;
 
 class PlugistoTableSeeder extends Seeder
 {
diff --git a/routes/web.php b/routes/web.php
index dc1fcf7c..7aa5b2f3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -75,7 +75,6 @@
     Route::delete('/users/{user}/roles',
         'Api\UserRolesController@destroy')->name('api.user-roles.destroy')->middleware('check_ability:manage_users');
 
-
     /* Plugins */
     Route::get('/plugins', 'PluginsController@index')->name('plugins');
     Route::patch('/plugins/{plugin}',
@@ -83,7 +82,6 @@
     Route::delete('/plugins/{plugin}',
         'Api\PluginsController@destroy')->name('api.plugins.destroy')->middleware('check_ability:manage-plugins');
 
-
     /* Mails */
     Route::get('/mails', 'MailsController@index')->name('mails');
     Route::post('/mails',
@@ -101,7 +99,6 @@
     Route::delete('/api/attachments',
         'Api\MailAttachmentsController@destroy')->name('api.mailAttachments.destroy')->middleware('check_ability:send_mails');
 
-
     /* Notifications */
     Route::get('/notifications', 'NotificationsController@index')->name('notifications')->middleware('check_ability:create_notifications');
     Route::post('/notifications', 'NotificationsController@store')->name('notifications.store')->middleware('check_ability:create_notifications');
@@ -110,11 +107,13 @@
 
     Route::get('/test', function () {
         auth()->loginUsingId(2);
+
         return redirect()->back();
     });
 
     Route::get('/test1', function () {
         auth()->loginUsingId(1);
+
         return redirect()->back();
     });
 });
diff --git a/server.php b/server.php
index 472abe28..20bc389f 100644
--- a/server.php
+++ b/server.php
@@ -12,8 +12,8 @@
 // This file allows us to emulate Apache's "mod_rewrite" functionality from the
 // built-in PHP web server. This provides a convenient way to test a Laravel
 // application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__ . '/public' . $uri)) {
+if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
     return false;
 }
 
-require_once __DIR__ . '/public/index.php';
+require_once __DIR__.'/public/index.php';
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index ff133fb4..60a3e8ca 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -2,8 +2,8 @@
 
 namespace Tests;
 
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Support\Facades\Hash;
 
 trait CreatesApplication
 {
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
index a8892eee..0a63fbb2 100644
--- a/tests/DuskTestCase.php
+++ b/tests/DuskTestCase.php
@@ -2,10 +2,10 @@
 
 namespace Tests;
 
-use Laravel\Dusk\TestCase as BaseTestCase;
 use Facebook\WebDriver\Chrome\ChromeOptions;
-use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Laravel\Dusk\TestCase as BaseTestCase;
 
 abstract class DuskTestCase extends BaseTestCase
 {
diff --git a/tests/Feature/AbilityTest.php b/tests/Feature/AbilityTest.php
index b278feb1..05a70d8c 100644
--- a/tests/Feature/AbilityTest.php
+++ b/tests/Feature/AbilityTest.php
@@ -3,8 +3,8 @@
 namespace Tests\Feature;
 
 use Auth;
-use Tests\TestCase;
 use Silber\Bouncer\Database\Ability;
+use Tests\TestCase;
 
 class AbilityTest extends TestCase
 {
diff --git a/tests/Feature/AdminCommandTest.php b/tests/Feature/AdminCommandTest.php
index cc84fd5c..c6c99af9 100644
--- a/tests/Feature/AdminCommandTest.php
+++ b/tests/Feature/AdminCommandTest.php
@@ -2,14 +2,14 @@
 
 namespace Tests\Feature;
 
+use App\User;
 use Artisan;
 use Bouncer;
-use App\User;
 use Tests\TestCase;
 
 class AdminCommandTest extends TestCase
 {
-    public function setUp():void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/Feature/Api/MailAttachmentsTest.php b/tests/Feature/Api/MailAttachmentsTest.php
index 644c9f6c..bcd43df9 100644
--- a/tests/Feature/Api/MailAttachmentsTest.php
+++ b/tests/Feature/Api/MailAttachmentsTest.php
@@ -3,9 +3,9 @@
 namespace Tests\Feature\Api;
 
 use App\User;
-use Tests\TestCase;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
 
 class MailAttachmentsTest extends TestCase
 {
diff --git a/tests/Feature/Api/UserEmailTest.php b/tests/Feature/Api/UserEmailTest.php
index eb7ef6e9..74ba8a2d 100644
--- a/tests/Feature/Api/UserEmailTest.php
+++ b/tests/Feature/Api/UserEmailTest.php
@@ -36,6 +36,7 @@ public function a_user_can_update_his_email(): void
      * This endpoint is only to be used for the signed in user.
      * An admin or authorized user can use the api.users.update endpoint.
      */
+
     /** @test */
     public function an_admin_cannot_update_a_users_email(): void
     {
@@ -53,6 +54,4 @@ public function an_admin_cannot_update_a_users_email(): void
 
         $this->assertNotEquals($newEmail, $user->fresh()->email);
     }
-
-
 }
diff --git a/tests/Feature/Api/UserPasswordTest.php b/tests/Feature/Api/UserPasswordTest.php
index 25880fe3..36f72142 100644
--- a/tests/Feature/Api/UserPasswordTest.php
+++ b/tests/Feature/Api/UserPasswordTest.php
@@ -17,7 +17,7 @@ public function a_user_can_update_his_password(): void
 
         $payload = [
             'new-password' => $newPassword,
-            'new-password_confirmation' => $newPassword
+            'new-password_confirmation' => $newPassword,
         ];
 
         $this->post(route('api.user.password', $user->id), $payload)
@@ -35,7 +35,7 @@ public function an_admin_cannot_update_a_users_password(): void
 
         $payload = [
             'new-password' => $newPassword,
-            'new-password_confirmation' => $newPassword
+            'new-password_confirmation' => $newPassword,
         ];
 
         $this->post(route('api.user.password', $user->id), $payload)
diff --git a/tests/Feature/Api/UserTest.php b/tests/Feature/Api/UserTest.php
index 27d5806e..18360278 100644
--- a/tests/Feature/Api/UserTest.php
+++ b/tests/Feature/Api/UserTest.php
@@ -2,9 +2,7 @@
 
 namespace Tests\Feature\Api;
 
-use App\Scopes\ActiveScope;
 use App\User;
-use Hash;
 use Tests\TestCase;
 
 class UserTest extends TestCase
@@ -392,8 +390,8 @@ public function full_room_is_updated_after_user_room_update(): void
         $this->signInAdmin();
 
         $user = create(User::class);
-        ++$user->room;
-        $newFullRoom = str_pad($user->floor, 2, 0, STR_PAD_LEFT) . str_pad($user->room, 2, 0,
+        $user->room++;
+        $newFullRoom = str_pad($user->floor, 2, 0, STR_PAD_LEFT).str_pad($user->room, 2, 0,
                 STR_PAD_LEFT);
 
         $this->post(route('api.users.update', $user->id), $user->toArray())
diff --git a/tests/Feature/Auth/RegisterUserTest.php b/tests/Feature/Auth/RegisterUserTest.php
index 348c9ba2..e581bcf5 100644
--- a/tests/Feature/Auth/RegisterUserTest.php
+++ b/tests/Feature/Auth/RegisterUserTest.php
@@ -2,14 +2,14 @@
 
 namespace Tests\Feature\Auth;
 
+use App\Mail\ConfirmEmailMail;
 use App\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Arr;
-use Tests\TestCase;
-use App\Mail\ConfirmEmailMail;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
-use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class RegisterUserTest extends TestCase
 {
diff --git a/tests/Feature/ConfirmUserCommandTest.php b/tests/Feature/ConfirmUserCommandTest.php
index b13121af..48b3e1ed 100644
--- a/tests/Feature/ConfirmUserCommandTest.php
+++ b/tests/Feature/ConfirmUserCommandTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use Artisan;
 use App\User;
+use Artisan;
 use Tests\TestCase;
 
 class ConfirmUserCommandTest extends TestCase
diff --git a/tests/Feature/DashboardTest.php b/tests/Feature/DashboardTest.php
index b765fe2a..b3848a0e 100644
--- a/tests/Feature/DashboardTest.php
+++ b/tests/Feature/DashboardTest.php
@@ -3,9 +3,9 @@
 namespace Tests\Feature;
 
 use Auth;
-use Tests\TestCase;
 use Gerpo\Plugisto\Models\Plugisto;
 use Gerpo\Plugisto\Scopes\ActiveScope;
+use Tests\TestCase;
 
 class DashboardTest extends TestCase
 {
diff --git a/tests/Feature/MailTest.php b/tests/Feature/MailTest.php
index 14ca05de..8b8ff4b6 100644
--- a/tests/Feature/MailTest.php
+++ b/tests/Feature/MailTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Feature;
 
-use Mail;
-use Event;
-use App\User;
-use Tests\TestCase;
 use App\Mail\RegularMail;
+use App\User;
+use Event;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
+use Mail;
+use Tests\TestCase;
 
 class MailTest extends TestCase
 {
diff --git a/tests/Feature/NotificationsTest.php b/tests/Feature/NotificationsTest.php
index b4b6fe8b..1c10662d 100644
--- a/tests/Feature/NotificationsTest.php
+++ b/tests/Feature/NotificationsTest.php
@@ -3,7 +3,6 @@
 namespace Tests\Feature;
 
 use App\Mail\NotificationMail;
-use App\Mail\RegularMail;
 use App\Notification;
 use App\User;
 use Event;
@@ -72,8 +71,8 @@ public function an_admin_can_create_a_new_notification(): void
         $this->signInAdmin();
 
         $notification = [
-            'title' => "Test Title",
-            'message' => "Test Message",
+            'title' => 'Test Title',
+            'message' => 'Test Message',
             'is_active' => true,
         ];
 
@@ -92,8 +91,8 @@ public function an_authorized_can_create_a_new_notification(): void
         $this->signIn($user);
 
         $notification = [
-            'title' => "Test Title",
-            'message' => "Test Message",
+            'title' => 'Test Title',
+            'message' => 'Test Message',
             'is_active' => true,
         ];
 
@@ -109,8 +108,8 @@ public function an_unauthorized_cannot_create_a_new_notification(): void
         $this->withExceptionHandling()->signIn();
 
         $notification = [
-            'title' => "Test Title",
-            'message' => "Test Message",
+            'title' => 'Test Title',
+            'message' => 'Test Message',
             'is_active' => true,
         ];
 
@@ -222,8 +221,8 @@ public function mails_are_send_if_requested(): void
         create(User::class);
 
         $notification = [
-            'title' => "Test Title",
-            'message' => "Test Message",
+            'title' => 'Test Title',
+            'message' => 'Test Message',
             'is_active' => true,
             'send_mail' => true,
         ];
@@ -241,8 +240,8 @@ public function mails_are_not_send_if_not_requested(): void
         create(User::class);
 
         $notification = [
-            'title' => "Test Title",
-            'message' => "Test Message",
+            'title' => 'Test Title',
+            'message' => 'Test Message',
             'is_active' => true,
             'send_mail' => false,
         ];
@@ -260,8 +259,8 @@ public function mails_are_not_send_if_requested_but_not_published(): void
         create(User::class);
 
         $notification = [
-            'title' => "Test Title",
-            'message' => "Test Message",
+            'title' => 'Test Title',
+            'message' => 'Test Message',
             'is_active' => false,
             'send_mail' => true,
         ];
diff --git a/tests/Feature/PluginsTest.php b/tests/Feature/PluginsTest.php
index 15b41690..0f140fe0 100644
--- a/tests/Feature/PluginsTest.php
+++ b/tests/Feature/PluginsTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use Tests\TestCase;
 use Gerpo\Plugisto\Models\Plugisto;
+use Tests\TestCase;
 
 class PluginsTest extends TestCase
 {
diff --git a/tests/Feature/RoleAbilitiesTest.php b/tests/Feature/RoleAbilitiesTest.php
index 65acc132..82ffcf44 100644
--- a/tests/Feature/RoleAbilitiesTest.php
+++ b/tests/Feature/RoleAbilitiesTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature;
 
-use Bouncer;
 use App\Role;
-use Tests\TestCase;
+use Bouncer;
 use Silber\Bouncer\Database\Ability;
+use Tests\TestCase;
 
 class RoleAbilitiesTest extends TestCase
 {
diff --git a/tests/Feature/RoleTest.php b/tests/Feature/RoleTest.php
index 347d20f4..3af192d1 100644
--- a/tests/Feature/RoleTest.php
+++ b/tests/Feature/RoleTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use Auth;
 use App\Role;
+use Auth;
 use Tests\TestCase;
 
 class RoleTest extends TestCase
diff --git a/tests/Feature/UserRolesTest.php b/tests/Feature/UserRolesTest.php
index 26473025..c9e3451d 100644
--- a/tests/Feature/UserRolesTest.php
+++ b/tests/Feature/UserRolesTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature;
 
-use Bouncer;
 use App\Role;
 use App\User;
+use Bouncer;
 use Tests\TestCase;
 
 class UserRolesTest extends TestCase
diff --git a/tests/Feature/VerifyTest.php b/tests/Feature/VerifyTest.php
index 443b3334..ed36e99e 100644
--- a/tests/Feature/VerifyTest.php
+++ b/tests/Feature/VerifyTest.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Tests\Feature;
 
-
 use App\Mail\ConfirmEmailMail;
 use App\User;
 use Mail;
@@ -62,4 +60,4 @@ protected function setUp(): void
 
         Mail::fake();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 725d4947..726b033d 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -30,8 +30,7 @@ protected function disableExceptionHandling()
     {
         $this->oldExceptionHandler = $this->app->make(ExceptionHandler::class);
 
-        $this->app->instance(ExceptionHandler::class, new class extends Handler
-        {
+        $this->app->instance(ExceptionHandler::class, new class extends Handler {
             public function __construct()
             {
             }
@@ -58,7 +57,6 @@ protected function signIn($user = null, $ability = null)
         return $this;
     }
 
-
     protected function signInAdmin($admin = null)
     {
         $admin = $admin ?: create(User::class);
diff --git a/tests/Unit/NotificationTest.php b/tests/Unit/NotificationTest.php
index 08e18e85..fcff1723 100644
--- a/tests/Unit/NotificationTest.php
+++ b/tests/Unit/NotificationTest.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Tests\Unit;
 
-
 use App\Notification;
 use App\User;
 use Tests\TestCase;
@@ -81,4 +79,4 @@ public function notification_can_be_published(): void
 
         $this->assertTrue($savedNotification->is_active);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/utilities/functions.php b/tests/utilities/functions.php
index 89e2f988..b1c82f74 100644
--- a/tests/utilities/functions.php
+++ b/tests/utilities/functions.php
@@ -1,7 +1,5 @@
 <?php
 
-use App\User;
-
 function create($class, $attributes = [], $times = null)
 {
     return factory($class, $times)->create($attributes);