diff --git a/app/Events/Invoice/InvoiceWasPaid.php b/app/Events/Invoice/InvoiceWasPaid.php
index af1ff64011fa..dffe4343d2c2 100644
--- a/app/Events/Invoice/InvoiceWasPaid.php
+++ b/app/Events/Invoice/InvoiceWasPaid.php
@@ -48,5 +48,4 @@ class InvoiceWasPaid
         $this->company = $company;
         $this->event_vars = $event_vars;
     }
-
 }
diff --git a/app/Http/Controllers/BankTransactionController.php b/app/Http/Controllers/BankTransactionController.php
index 3967a969750e..ff223acdf0cf 100644
--- a/app/Http/Controllers/BankTransactionController.php
+++ b/app/Http/Controllers/BankTransactionController.php
@@ -468,7 +468,6 @@ class BankTransactionController extends BaseController
         $bank_transactions = BankTransaction::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if ($action == 'convert_matched') { //catch this action
-            
             $this->bank_transaction_repo->convert_matched($bank_transactions);
         } else {
             $bank_transactions->each(function ($bank_transaction, $key) use ($action) {
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index 9217bdce5967..9bdb48f53767 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -13,7 +13,6 @@ namespace App\Jobs\Entity;
 
 use App\Exceptions\FilePermissionsFailure;
 use App\Libraries\MultiDB;
-use App\Models\Account;
 use App\Models\Credit;
 use App\Models\CreditInvitation;
 use App\Models\Design;
diff --git a/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
index 8dc45cf74f8d..d3293116a6c1 100644
--- a/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
+++ b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
@@ -28,7 +28,8 @@ class ClientLedgerBalanceUpdate implements ShouldQueue
     public $tries = 1;
     public $deleteWhenMissingModels = true;
     public function __construct(public Company $company, public Client $client)
-    {}
+    {
+    }
 
     /**
      * Execute the job.
@@ -68,5 +69,4 @@ class ClientLedgerBalanceUpdate implements ShouldQueue
     {
         return [(new WithoutOverlapping($this->client->id))->dontRelease()];
     }
-
 }
diff --git a/app/Jobs/Util/WebhookSingle.php b/app/Jobs/Util/WebhookSingle.php
index 23749f84c64e..dc4f8314c39c 100644
--- a/app/Jobs/Util/WebhookSingle.php
+++ b/app/Jobs/Util/WebhookSingle.php
@@ -158,8 +158,8 @@ class WebhookSingle implements ShouldQueue
                     $this->company
                 ))->handle();
 
-                /* Some 400's should never be repeated */ 
-                if(in_array($e->getResponse()->getStatusCode(), [404, 410])){
+                /* Some 400's should never be repeated */
+                if (in_array($e->getResponse()->getStatusCode(), [404, 410])) {
                     $this->fail();
                     return;
                 }
@@ -227,7 +227,6 @@ class WebhookSingle implements ShouldQueue
 
     private function resolveClient()
     {
-        
         //make sure it isn't an instance of the Client Model
         if (!$this->entity instanceof \App\Models\Client &&
             !$this->entity instanceof \App\Models\Vendor &&
@@ -238,7 +237,6 @@ class WebhookSingle implements ShouldQueue
         }
 
         return null;
-
     }
 
     public function failed($exception = null)
diff --git a/app/Listeners/Credit/CreditCreatedNotification.php b/app/Listeners/Credit/CreditCreatedNotification.php
index 19aca5a7c708..5c7b0350412b 100644
--- a/app/Listeners/Credit/CreditCreatedNotification.php
+++ b/app/Listeners/Credit/CreditCreatedNotification.php
@@ -67,7 +67,6 @@ class CreditCreatedNotification implements ShouldQueue
                 $nmo->to_user = $user;
 
                 (new NinjaMailerJob($nmo))->handle();
-
             }
 
             /* Override the methods in the Notification Class */
diff --git a/app/Listeners/Credit/CreditEmailedNotification.php b/app/Listeners/Credit/CreditEmailedNotification.php
index db09b5a6ae70..1d04798b81c6 100644
--- a/app/Listeners/Credit/CreditEmailedNotification.php
+++ b/app/Listeners/Credit/CreditEmailedNotification.php
@@ -63,9 +63,7 @@ class CreditEmailedNotification implements ShouldQueue
                 $nmo->to_user = $user;
 
                 (new NinjaMailerJob($nmo))->handle();
-
             }
-
         }
     }
 }
diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php
index f2d64a0c8103..13cb70222beb 100644
--- a/app/Listeners/Invoice/InvoicePaidActivity.php
+++ b/app/Listeners/Invoice/InvoicePaidActivity.php
@@ -56,6 +56,5 @@ class InvoicePaidActivity implements ShouldQueue
         if ($event->invoice->subscription()->exists()) {
             $event->invoice->subscription->service()->planPaid($event->invoice);
         }
-
     }
 }
diff --git a/app/Listeners/Quote/QuoteEmailedNotification.php b/app/Listeners/Quote/QuoteEmailedNotification.php
index 296e7df119d0..828941ced506 100644
--- a/app/Listeners/Quote/QuoteEmailedNotification.php
+++ b/app/Listeners/Quote/QuoteEmailedNotification.php
@@ -16,7 +16,6 @@ use App\Jobs\Mail\NinjaMailerJob;
 use App\Jobs\Mail\NinjaMailerObject;
 use App\Libraries\MultiDB;
 use App\Mail\Admin\EntitySentObject;
-use App\Notifications\Admin\EntitySentNotification;
 use App\Utils\Traits\Notifications\UserNotifies;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
@@ -62,9 +61,7 @@ class QuoteEmailedNotification implements ShouldQueue
                 $nmo->to_user = $user;
 
                 (new NinjaMailerJob($nmo))->handle();
-
             }
-
         }
     }
 }
diff --git a/app/Listeners/Subscription/AppStoreRenewSubscription.php b/app/Listeners/Subscription/AppStoreRenewSubscription.php
index 8b6ee587dae0..07e5c493f9b3 100644
--- a/app/Listeners/Subscription/AppStoreRenewSubscription.php
+++ b/app/Listeners/Subscription/AppStoreRenewSubscription.php
@@ -58,6 +58,5 @@ class AppStoreRenewSubscription implements ShouldQueue
         }
 
         $account->save();
-
     }
 }
diff --git a/app/Listeners/Subscription/PlayStoreRenewSubscription.php b/app/Listeners/Subscription/PlayStoreRenewSubscription.php
index 75a1561c9151..49ec9805d6fc 100644
--- a/app/Listeners/Subscription/PlayStoreRenewSubscription.php
+++ b/app/Listeners/Subscription/PlayStoreRenewSubscription.php
@@ -11,12 +11,12 @@
 
 namespace App\Listeners\Subscription;
 
-use Carbon\Carbon;
+use App\Libraries\MultiDB;
 use App\Models\Account;
 use App\Models\Company;
-use App\Libraries\MultiDB;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use App\Notifications\Ninja\RenewalFailureNotification;
+use Carbon\Carbon;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRenewed;
 
 class PlayStoreRenewSubscription implements ShouldQueue
@@ -44,6 +44,4 @@ class PlayStoreRenewSubscription implements ShouldQueue
             return;
         }
     }
-
-
 }
diff --git a/app/Mail/Admin/EntityPaidObject.php b/app/Mail/Admin/EntityPaidObject.php
index aa806d66e4a6..ef7edd284e33 100644
--- a/app/Mail/Admin/EntityPaidObject.php
+++ b/app/Mail/Admin/EntityPaidObject.php
@@ -12,11 +12,11 @@
 namespace App\Mail\Admin;
 
 use App\Mail\Engine\PaymentEmailEngine;
+use App\Models\Payment;
 use App\Utils\Ninja;
 use App\Utils\Number;
 use Illuminate\Support\Facades\App;
 use stdClass;
-use App\Models\Payment;
 
 class EntityPaidObject
 {
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index a8f7d44f46d7..eb2f10735d4d 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -388,7 +388,6 @@ class PaymentEmailEngine extends BaseEmailEngine
      */
     private function buildViewButton(string $link, string $text): string
     {
-
         return '
 <!--[if (gte mso 9)|(IE)]>
 <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 7bded57017a0..42c834d67cb6 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -75,7 +75,7 @@ class CompanyGateway extends BaseModel
     // const TYPE_PAYFAST = 310;
     // const TYPE_PAYTRACE = 311;
     // const TYPE_MOLLIE = 312;
-    // const TYPE_EWAY = 313; 
+    // const TYPE_EWAY = 313;
     // const TYPE_FORTE = 314;
 
     public $gateway_consts = [
diff --git a/app/Models/CreditInvitation.php b/app/Models/CreditInvitation.php
index 1f600e19aff4..035f6f4193a0 100644
--- a/app/Models/CreditInvitation.php
+++ b/app/Models/CreditInvitation.php
@@ -12,7 +12,6 @@
 namespace App\Models;
 
 use App\Jobs\Entity\CreateEntityPdf;
-use App\Utils\Ninja;
 use App\Utils\Traits\Inviteable;
 use App\Utils\Traits\MakesDates;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Models/QuoteInvitation.php b/app/Models/QuoteInvitation.php
index d5cb22710a89..d1b645ba4365 100644
--- a/app/Models/QuoteInvitation.php
+++ b/app/Models/QuoteInvitation.php
@@ -11,9 +11,7 @@
 
 namespace App\Models;
 
-use App\Events\Quote\QuoteWasUpdated;
 use App\Jobs\Entity\CreateEntityPdf;
-use App\Utils\Ninja;
 use App\Utils\Traits\Inviteable;
 use App\Utils\Traits\MakesDates;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Models/Scheduler.php b/app/Models/Scheduler.php
index cc0f61a7c2f0..2e34d9ab2e06 100644
--- a/app/Models/Scheduler.php
+++ b/app/Models/Scheduler.php
@@ -13,7 +13,6 @@ namespace App\Models;
 
 use App\Services\Scheduler\SchedulerService;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Carbon;
 
 /**
  * @property bool paused
@@ -88,5 +87,4 @@ class Scheduler extends BaseModel
             return $this->remaining_cycles - 1;
         }
     }
-    
 }
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index b15e78de4d2d..a8ed03cb2daf 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -11,39 +11,34 @@
 
 namespace App\PaymentDrivers;
 
-use Exception;
-use App\Utils\Ninja;
+use App\Events\Invoice\InvoiceWasPaid;
+use App\Events\Payment\PaymentWasCreated;
+use App\Exceptions\PaymentFailed;
+use App\Factory\PaymentFactory;
+use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
+use App\Jobs\Mail\NinjaMailer;
+use App\Jobs\Mail\NinjaMailerJob;
+use App\Jobs\Mail\NinjaMailerObject;
+use App\Jobs\Mail\PaymentFailedMailer;
+use App\Jobs\Util\SystemLogger;
+use App\Mail\Admin\ClientPaymentFailureObject;
 use App\Models\Client;
-use App\Utils\Helpers;
+use App\Models\ClientContact;
+use App\Models\ClientGatewayToken;
+use App\Models\CompanyGateway;
+use App\Models\GatewayType;
 use App\Models\Invoice;
 use App\Models\Payment;
-use App\Models\SystemLog;
-use App\Models\GatewayType;
 use App\Models\PaymentHash;
-use App\Models\PaymentType;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
-use App\Models\ClientContact;
-use App\Jobs\Mail\NinjaMailer;
-use App\Models\CompanyGateway;
-use Illuminate\Support\Carbon;
-use App\Factory\PaymentFactory;
-use App\Jobs\Util\SystemLogger;
-use App\Utils\Traits\MakesHash;
-use App\Models\TransactionEvent;
-use App\Exceptions\PaymentFailed;
-use App\Jobs\Mail\NinjaMailerJob;
-use App\Jobs\Ninja\TransactionLog;
-use App\Models\ClientGatewayToken;
-use App\Jobs\Mail\NinjaMailerObject;
-use App\Utils\Traits\SystemLogTrait;
-use App\Events\Invoice\InvoiceWasPaid;
-use App\Jobs\Mail\PaymentFailedMailer;
-use App\Events\Payment\PaymentWasCreated;
-use App\Mail\Admin\ClientPaymentFailureObject;
+use App\Models\SystemLog;
 use App\Services\Subscription\SubscriptionService;
-use Checkout\Library\Exceptions\CheckoutHttpException;
-use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
+use App\Utils\Helpers;
+use App\Utils\Ninja;
+use App\Utils\Traits\MakesHash;
+use App\Utils\Traits\SystemLogTrait;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 
 /**
  * Class BaseDriver.
@@ -154,33 +149,24 @@ class BaseDriver extends AbstractPaymentDriver
         }
 
         if ($this->company_gateway->require_custom_value1) {
-
             $fields[] = ['name' => 'client_custom_value1', 'label' => $this->helpers->makeCustomField($this->client->company->custom_fields, 'client1'), 'type' => 'text', 'validation' => 'required'];
-
         }
         
         if ($this->company_gateway->require_custom_value2) {
-
             $fields[] = ['name' => 'client_custom_value2', 'label' => $this->helpers->makeCustomField($this->client->company->custom_fields, 'client2'), 'type' => 'text', 'validation' => 'required'];
-
         }
 
 
         if ($this->company_gateway->require_custom_value3) {
-
             $fields[] = ['name' => 'client_custom_value3', 'label' => $this->helpers->makeCustomField($this->client->company->custom_fields, 'client3'), 'type' => 'text', 'validation' => 'required'];
-
         }
 
 
         if ($this->company_gateway->require_custom_value4) {
-
             $fields[] = ['name' => 'client_custom_value4', 'label' => $this->helpers->makeCustomField($this->client->company->custom_fields, 'client4'), 'type' => 'text', 'validation' => 'required'];
-
         }
 
         return $fields;
-
     }
 
     /**
@@ -373,11 +359,11 @@ class BaseDriver extends AbstractPaymentDriver
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
 
         if (property_exists($this->payment_hash->data, 'billing_context') && $status == Payment::STATUS_COMPLETED) {
-
-            if(is_int($this->payment_hash->data->billing_context->subscription_id))
+            if (is_int($this->payment_hash->data->billing_context->subscription_id)) {
                 $billing_subscription = \App\Models\Subscription::find($this->payment_hash->data->billing_context->subscription_id);
-            else
+            } else {
                 $billing_subscription = \App\Models\Subscription::find($this->decodePrimaryKey($this->payment_hash->data->billing_context->subscription_id));
+            }
 
             // To access campaign hash => $this->payment_hash->data->billing_context->campaign;
             // To access campaign data => Cache::get(CAMPAIGN_HASH)
@@ -398,7 +384,6 @@ class BaseDriver extends AbstractPaymentDriver
      */
     public function confirmGatewayFee() :void
     {
-
         /*Payment invoices*/
         $payment_invoices = $this->payment_hash->invoices();
 
@@ -412,7 +397,6 @@ class BaseDriver extends AbstractPaymentDriver
             if (collect($invoice->line_items)->contains('type_id', '3')) {
                 $invoice->service()->toggleFeesPaid()->save();
             }
-
         });
     }
 
@@ -510,7 +494,7 @@ class BaseDriver extends AbstractPaymentDriver
 
     public function sendFailureMail($error)
     {
-        if(is_object($error)){
+        if (is_object($error)) {
             $error = 'Payment Aborted';
         }
 
diff --git a/app/Services/Email/EmailObject.php b/app/Services/Email/EmailObject.php
index 4488fd02366f..01dfb7ed7a95 100644
--- a/app/Services/Email/EmailObject.php
+++ b/app/Services/Email/EmailObject.php
@@ -11,11 +11,11 @@
 
 namespace App\Services\Email;
 
-use App\Models\User;
 use App\Models\Client;
-use App\Models\Vendor;
-use App\Models\Company;
 use App\Models\ClientContact;
+use App\Models\Company;
+use App\Models\User;
+use App\Models\Vendor;
 use App\Models\VendorContact;
 use Illuminate\Mail\Mailables\Address;
 
diff --git a/app/Services/Email/MailEntity.php b/app/Services/Email/MailEntity.php
index a8946e2bc7be..64629e57f523 100644
--- a/app/Services/Email/MailEntity.php
+++ b/app/Services/Email/MailEntity.php
@@ -105,7 +105,6 @@ class MailEntity implements ShouldQueue
      */
     public function configureMailer(): self
     {
-        
         $this->mail = Mail::mailer($this->mailer);
         
         if ($this->client_postmark_secret) {
@@ -208,7 +207,6 @@ class MailEntity implements ShouldQueue
     public function trySending(): void
     {
         try {
-
             $this->mail->send($this->mailable);
 
             /* Count the amount of emails sent across all the users accounts */
diff --git a/app/Services/Scheduler/SchedulerService.php b/app/Services/Scheduler/SchedulerService.php
index ebb701e55e83..50a2cf67af44 100644
--- a/app/Services/Scheduler/SchedulerService.php
+++ b/app/Services/Scheduler/SchedulerService.php
@@ -11,12 +11,12 @@
 
 namespace App\Services\Scheduler;
 
-use App\Models\Client;
-use App\Models\Scheduler;
-use App\Utils\Traits\MakesHash;
-use App\Models\RecurringInvoice;
-use App\Utils\Traits\MakesDates;
 use App\DataMapper\Schedule\EmailStatement;
+use App\Models\Client;
+use App\Models\RecurringInvoice;
+use App\Models\Scheduler;
+use App\Utils\Traits\MakesDates;
+use App\Utils\Traits\MakesHash;
 
 class SchedulerService
 {
diff --git a/app/Utils/Number.php b/app/Utils/Number.php
index f19aefc690f1..3451ab6dd0c5 100644
--- a/app/Utils/Number.php
+++ b/app/Utils/Number.php
@@ -179,14 +179,11 @@ class Number
         } elseif ($swapSymbol) {
             return "{$value} ".trim($symbol);
         } elseif ($entity->getSetting('show_currency_code') === false) {
-
-                /* Ensures we place the negative symbol ahead of the currency symbol*/ 
-                if($_value < 0){
-
-                    $value = substr($value, 1);
-                    $symbol = "-{$symbol}";
-
-                }
+            /* Ensures we place the negative symbol ahead of the currency symbol*/
+            if ($_value < 0) {
+                $value = substr($value, 1);
+                $symbol = "-{$symbol}";
+            }
 
             return "{$symbol}{$value}";
         } else {