diff --git a/src/Events/CartTouched.php b/src/Events/CartTouched.php
index 48290cdf..9246ba50 100644
--- a/src/Events/CartTouched.php
+++ b/src/Events/CartTouched.php
@@ -8,7 +8,8 @@
 
 class CartTouched
 {
-    use Dispatchable, SerializesModels;
+    use Dispatchable;
+    use SerializesModels;
 
     /**
      * The cart instace.
diff --git a/src/Events/CheckoutFailed.php b/src/Events/CheckoutFailed.php
index c6f0971f..2ff882ed 100644
--- a/src/Events/CheckoutFailed.php
+++ b/src/Events/CheckoutFailed.php
@@ -8,7 +8,8 @@
 
 class CheckoutFailed
 {
-    use Dispatchable, SerializesModels;
+    use Dispatchable;
+    use SerializesModels;
 
     /**
      * The order instace.
diff --git a/src/Events/CheckoutFailing.php b/src/Events/CheckoutFailing.php
index 582f1894..b507ac02 100644
--- a/src/Events/CheckoutFailing.php
+++ b/src/Events/CheckoutFailing.php
@@ -8,7 +8,8 @@
 
 class CheckoutFailing
 {
-    use Dispatchable, SerializesModels;
+    use Dispatchable;
+    use SerializesModels;
 
     /**
      * The order instace.
diff --git a/src/Events/CheckoutProcessed.php b/src/Events/CheckoutProcessed.php
index ef4d981d..135343df 100644
--- a/src/Events/CheckoutProcessed.php
+++ b/src/Events/CheckoutProcessed.php
@@ -8,7 +8,8 @@
 
 class CheckoutProcessed
 {
-    use Dispatchable, SerializesModels;
+    use Dispatchable;
+    use SerializesModels;
 
     /**
      * The order instace.
diff --git a/src/Events/CheckoutProcessing.php b/src/Events/CheckoutProcessing.php
index cb756696..c19fe32b 100644
--- a/src/Events/CheckoutProcessing.php
+++ b/src/Events/CheckoutProcessing.php
@@ -8,7 +8,8 @@
 
 class CheckoutProcessing
 {
-    use Dispatchable, SerializesModels;
+    use Dispatchable;
+    use SerializesModels;
 
     /**
      * The order instace.
diff --git a/src/Events/OrderPlaced.php b/src/Events/OrderPlaced.php
index 7d792e56..1bb958d3 100644
--- a/src/Events/OrderPlaced.php
+++ b/src/Events/OrderPlaced.php
@@ -8,7 +8,8 @@
 
 class OrderPlaced
 {
-    use Dispatchable, SerializesModels;
+    use Dispatchable;
+    use SerializesModels;
 
     /**
      * The order instace.
diff --git a/src/Http/Controllers/Controller.php b/src/Http/Controllers/Controller.php
index 5940dee1..1788af82 100644
--- a/src/Http/Controllers/Controller.php
+++ b/src/Http/Controllers/Controller.php
@@ -9,5 +9,7 @@
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 }
diff --git a/src/Jobs/MoveFile.php b/src/Jobs/MoveFile.php
index a83eaf30..92bfbe3c 100644
--- a/src/Jobs/MoveFile.php
+++ b/src/Jobs/MoveFile.php
@@ -14,7 +14,10 @@
 
 class MoveFile implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * The medium instance.
diff --git a/src/Jobs/PerformConversions.php b/src/Jobs/PerformConversions.php
index 10e0d98c..fe532eb5 100644
--- a/src/Jobs/PerformConversions.php
+++ b/src/Jobs/PerformConversions.php
@@ -12,7 +12,10 @@
 
 class PerformConversions implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * The medium instance.
diff --git a/src/Listeners/SendNewOrderNotifications.php b/src/Listeners/SendNewOrderNotifications.php
index ed0c79b9..cca6b1c2 100644
--- a/src/Listeners/SendNewOrderNotifications.php
+++ b/src/Listeners/SendNewOrderNotifications.php
@@ -6,15 +6,11 @@
 use Bazar\Models\User;
 use Bazar\Notifications\AdminNewOrder;
 use Bazar\Notifications\CustomerNewOrder;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Notification;
 
-class SendNewOrderNotifications implements ShouldQueue
+class SendNewOrderNotifications
 {
-    use InteractsWithQueue;
-
     /**
      * Handle the event.
      *
diff --git a/src/Models/Address.php b/src/Models/Address.php
index 3e57caf9..90aa622d 100644
--- a/src/Models/Address.php
+++ b/src/Models/Address.php
@@ -16,7 +16,10 @@
 
 class Address extends Model implements Contract
 {
-    use BazarRoutable, Filterable, HasFactory, InteractsWithProxy;
+    use BazarRoutable;
+    use Filterable;
+    use HasFactory;
+    use InteractsWithProxy;
 
     /**
      * The accessors to append to the model's array form.
diff --git a/src/Models/Cart.php b/src/Models/Cart.php
index 7e616dea..a8541b99 100644
--- a/src/Models/Cart.php
+++ b/src/Models/Cart.php
@@ -17,7 +17,12 @@
 
 class Cart extends Model implements Contract
 {
-    use Addressable, HasFactory, HasUuid, InteractsWithDiscounts, InteractsWithItems, InteractsWithProxy;
+    use Addressable;
+    use HasFactory;
+    use HasUuid;
+    use InteractsWithDiscounts;
+    use InteractsWithItems;
+    use InteractsWithProxy;
 
     /**
      * The attributes that should have default values.
diff --git a/src/Models/Category.php b/src/Models/Category.php
index 78eb1dc0..0a5dbab7 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -18,7 +18,13 @@
 
 class Category extends Model implements Contract
 {
-    use BazarRoutable, Filterable, HasFactory, HasMedia, InteractsWithProxy, Sluggable, SoftDeletes;
+    use BazarRoutable;
+    use Filterable;
+    use HasFactory;
+    use HasMedia;
+    use InteractsWithProxy;
+    use Sluggable;
+    use SoftDeletes;
 
     /**
      * The attributes that are mass assignable.
diff --git a/src/Models/Item.php b/src/Models/Item.php
index c898c3ca..7f466e2f 100644
--- a/src/Models/Item.php
+++ b/src/Models/Item.php
@@ -14,7 +14,9 @@
 
 class Item extends MorphPivot implements Taxable
 {
-    use InteractsWithTaxes, HasUuid, Tappable;
+    use InteractsWithTaxes;
+    use HasUuid;
+    use Tappable;
 
     /**
      * The accessors to append to the model's array form.
diff --git a/src/Models/Medium.php b/src/Models/Medium.php
index cbfe6d4f..d8288bd2 100644
--- a/src/Models/Medium.php
+++ b/src/Models/Medium.php
@@ -17,7 +17,9 @@
 
 class Medium extends Model implements Contract
 {
-    use Filterable, HasFactory, InteractsWithProxy;
+    use Filterable;
+    use HasFactory;
+    use InteractsWithProxy;
 
     /**
      * The accessors to append to the model's array form.
diff --git a/src/Models/Order.php b/src/Models/Order.php
index 3ec74542..ab9658bd 100644
--- a/src/Models/Order.php
+++ b/src/Models/Order.php
@@ -21,8 +21,15 @@
 
 class Order extends Model implements Contract
 {
-    use Addressable, BazarRoutable, HasFactory, InteractsWithDiscounts, InteractsWithItems, InteractsWithProxy, SoftDeletes, Filterable {
-        filters as defaultFilters;
+    use Addressable;
+    use BazarRoutable;
+    use HasFactory;
+    use InteractsWithDiscounts;
+    use InteractsWithItems;
+    use InteractsWithProxy;
+    use SoftDeletes;
+    use Filterable {
+        Filterable::filters as defaultFilters;
     }
 
     /**
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 21c6ab49..33c6955c 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -25,8 +25,15 @@
 
 class Product extends Model implements Contract
 {
-    use BazarRoutable, HasFactory, InteractsWithProxy, InteractsWithStock, HasMedia, Sluggable, SoftDeletes, Filterable {
-        filters as defaultFilters;
+    use BazarRoutable;
+    use HasFactory;
+    use InteractsWithProxy;
+    use InteractsWithStock;
+    use HasMedia;
+    use Sluggable;
+    use SoftDeletes;
+    use Filterable {
+        Filterable::filters as defaultFilters;
     }
 
     /**
diff --git a/src/Models/Shipping.php b/src/Models/Shipping.php
index a8710462..a0d68cd0 100644
--- a/src/Models/Shipping.php
+++ b/src/Models/Shipping.php
@@ -16,7 +16,10 @@
 
 class Shipping extends Model implements Contract
 {
-    use Addressable, HasFactory, InteractsWithProxy, InteractsWithTaxes;
+    use Addressable;
+    use HasFactory;
+    use InteractsWithProxy;
+    use InteractsWithTaxes;
 
     /**
      * The accessors to append to the model's array form.
diff --git a/src/Models/Transaction.php b/src/Models/Transaction.php
index 1ab06ccd..c989b820 100644
--- a/src/Models/Transaction.php
+++ b/src/Models/Transaction.php
@@ -16,7 +16,8 @@
 
 class Transaction extends Model implements Contract
 {
-    use HasFactory, InteractsWithProxy;
+    use HasFactory;
+    use InteractsWithProxy;
 
     /**
      * The accessors to append to the model's array form.
diff --git a/src/Models/User.php b/src/Models/User.php
index 0823bbc2..3eb436cb 100644
--- a/src/Models/User.php
+++ b/src/Models/User.php
@@ -24,7 +24,11 @@
 
 class User extends Authenticatable implements Contract, MustVerifyEmail
 {
-    use BazarRoutable, Filterable, HasFactory, InteractsWithProxy, Notifiable, SoftDeletes;
+    use BazarRoutable;
+    use Filterable, HasFactory;
+    use InteractsWithProxy;
+    use Notifiable;
+    use SoftDeletes;
 
     /**
      * The accessors to append to the model's array form.
diff --git a/src/Models/Variant.php b/src/Models/Variant.php
index 8ad445aa..665f4e1f 100644
--- a/src/Models/Variant.php
+++ b/src/Models/Variant.php
@@ -21,7 +21,13 @@
 
 class Variant extends Model implements Contract
 {
-    use BazarRoutable, Filterable, HasFactory, HasMedia, InteractsWithProxy, InteractsWithStock, SoftDeletes;
+    use BazarRoutable;
+    use Filterable;
+    use HasFactory;
+    use HasMedia;
+    use InteractsWithProxy;
+    use InteractsWithStock;
+    use SoftDeletes;
 
     /**
      * The accessors to append to the model's array form.