diff --git a/app/Http/Controllers/PaymentWebhookController.php b/app/Http/Controllers/PaymentWebhookController.php
index 2e9104f315..2c63b4615e 100644
--- a/app/Http/Controllers/PaymentWebhookController.php
+++ b/app/Http/Controllers/PaymentWebhookController.php
@@ -19,13 +19,14 @@ class PaymentWebhookController extends Controller
     public function __invoke(PaymentWebhookRequest $request)
     {
         //return early if we cannot resolve the company gateway
-        if (!$request->getCompanyGateway()) {
+        $company_gateway = $request->getCompanyGateway();
+
+        if (!$company_gateway) {
             return response()->json([], 200);
         }
 
-        return $request
-            ->getCompanyGateway()
-            ->driver()
-            ->processWebhookRequest($request);
+        return $company_gateway
+                ->driver()
+                ->processWebhookRequest($request);
     }
 }
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index 56cacf4721..c6586527eb 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -607,7 +607,7 @@ return new class extends Migration {
             $t->timestamps(6);
             $t->softDeletes('deleted_at', 6);
 
-            $t->index(['deleted_at', 'credit_id', 'company_id']);
+            $t->index(['credit_id', 'deleted_at']);
             $t->unique(['client_contact_id', 'credit_id']);
         });
 
@@ -844,7 +844,7 @@ return new class extends Migration {
             $t->timestamps(6);
             $t->softDeletes('deleted_at', 6);
 
-            $t->index(['deleted_at', 'invoice_id', 'company_id']);
+            $t->index(['invoice_id', 'company_id']);
             $t->unique(['client_contact_id', 'invoice_id']);
         });
 
@@ -873,7 +873,7 @@ return new class extends Migration {
             $t->timestamps(6);
             $t->softDeletes('deleted_at', 6);
 
-            $t->index(['deleted_at', 'quote_id', 'company_id']);
+            $t->index(['quote_id', 'deleted_at']);
             $t->unique(['client_contact_id', 'quote_id']);
         });
 
diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
index 5944297e60..4779625521 100644
--- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
+++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
@@ -99,7 +99,7 @@ return new class extends Migration {
             $t->timestamps(6);
             $t->softDeletes('deleted_at', 6);
 
-            $t->index(['deleted_at', 'recurring_invoice_id', 'company_id'], 'rec_co_del');
+            $t->index(['recurring_invoice_id', 'deleted_at'], 'rec_co_del');
             $t->unique(['client_contact_id', 'recurring_invoice_id'], 'cli_rec');
         });
     }
diff --git a/database/migrations/2021_08_23_101529_recurring_expenses_schema.php b/database/migrations/2021_08_23_101529_recurring_expenses_schema.php
index 5d4e57c311..3903f345f8 100644
--- a/database/migrations/2021_08_23_101529_recurring_expenses_schema.php
+++ b/database/migrations/2021_08_23_101529_recurring_expenses_schema.php
@@ -129,7 +129,7 @@ return new class extends Migration {
             $t->timestamps(6);
             $t->softDeletes('deleted_at', 6);
 
-            $t->index(['deleted_at', 'recurring_quote_id', 'company_id'], 'rec_co_del_q');
+            $t->index(['recurring_quote_id', 'deleted_at'], 'rec_co_del_q');
             $t->unique(['client_contact_id', 'recurring_quote_id'], 'cli_rec_q');
         });
     }