diff --git a/app/Jobs/SendWelcomeEmail.php b/app/Jobs/SendWelcomeEmail.php
index 974bb2706..73ae11213 100644
--- a/app/Jobs/SendWelcomeEmail.php
+++ b/app/Jobs/SendWelcomeEmail.php
@@ -3,13 +3,12 @@
 namespace App\Jobs;
 
 use App\Mail\WelcomeEmail;
-use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Support\Facades\Mail;
 
 class SendWelcomeEmail implements ShouldQueue
 {
diff --git a/app/Mail/NewAccountCreatedEmail.php b/app/Mail/NewAccountCreatedEmail.php
index 1651b644c..26353243c 100644
--- a/app/Mail/NewAccountCreatedEmail.php
+++ b/app/Mail/NewAccountCreatedEmail.php
@@ -3,11 +3,9 @@
 namespace App\Mail;
 
 use App\Models\Settings;
-use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class NewAccountCreatedEmail extends Mailable
 {
diff --git a/app/Mail/WelcomeEmail.php b/app/Mail/WelcomeEmail.php
index e81457cd8..b17ea66ad 100644
--- a/app/Mail/WelcomeEmail.php
+++ b/app/Mail/WelcomeEmail.php
@@ -3,11 +3,9 @@
 namespace App\Mail;
 
 use App\Models\Settings;
-use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class WelcomeEmail extends Mailable
 {
@@ -35,6 +33,6 @@ class WelcomeEmail extends Mailable
      */
     public function build()
     {
-        return $this->from(Settings::settingValue('site.main.email'))->subject('Welcome to '. Settings::settingValue('site.main.title'))->view('emails.welcome')->with(['username' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
+        return $this->from(Settings::settingValue('site.main.email'))->subject('Welcome to '.Settings::settingValue('site.main.title'))->view('emails.welcome')->with(['username' => $this->user->username, 'site' => Settings::settingValue('site.main.title')]);
     }
 }
diff --git a/app/Observers/UserServiceObserver.php b/app/Observers/UserServiceObserver.php
index 530ac26f5..db8b1f155 100644
--- a/app/Observers/UserServiceObserver.php
+++ b/app/Observers/UserServiceObserver.php
@@ -2,9 +2,9 @@
 
 namespace App\Observers;
 
-use App\Jobs\SendNewRegisteredAccountMail;
-use App\Jobs\SendWelcomeEmail;
 use App\Models\User;
+use App\Jobs\SendWelcomeEmail;
+use App\Jobs\SendNewRegisteredAccountMail;
 use Jrean\UserVerification\Facades\UserVerification;
 
 class UserServiceObserver