diff --git a/app/Models/Album.php b/app/Models/Album.php
index cc88c867..3c902b0b 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -20,7 +20,6 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use App\Contracts\Commentable;
 use App\Contracts\Favouritable;
 use App\Contracts\Searchable;
@@ -34,6 +33,7 @@ use DB;
 use Exception;
 use Gate;
 use Helpers;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -91,7 +91,6 @@ use Venturecraft\Revisionable\RevisionableTrait;
 class Album extends Model implements Searchable, Commentable, Favouritable
 {
     use HasFactory;
-
     use SoftDeletes, SlugTrait, TrackCollection, RevisionableTrait, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'album';
diff --git a/app/Models/Genre.php b/app/Models/Genre.php
index 0b9f2131..291c56e2 100644
--- a/app/Models/Genre.php
+++ b/app/Models/Genre.php
@@ -20,9 +20,9 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use App\Traits\SlugTrait;
 use DB;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Track.php b/app/Models/Track.php
index 4ba00926..ecae76bd 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -20,7 +20,6 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use App\Contracts\Commentable;
 use App\Contracts\Favouritable;
 use App\Contracts\Searchable;
@@ -37,6 +36,7 @@ use External;
 use Gate;
 use getid3_writetags;
 use Helpers;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -150,7 +150,6 @@ use Venturecraft\Revisionable\RevisionableTrait;
 class Track extends Model implements Searchable, Commentable, Favouritable
 {
     use HasFactory;
-
     use SoftDeletes, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'track';
diff --git a/app/Models/User.php b/app/Models/User.php
index 1426793d..b4511177 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -20,7 +20,6 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use App\Contracts\Commentable;
 use App\Contracts\Searchable;
 use App\Traits\IndexedInElasticsearchTrait;
@@ -32,6 +31,7 @@ use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -106,7 +106,6 @@ use Venturecraft\Revisionable\RevisionableTrait;
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract, \Illuminate\Contracts\Auth\Access\Authorizable, Searchable, Commentable
 {
     use HasFactory;
-
     use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait, IndexedInElasticsearchTrait;
 
     protected $elasticsearchType = 'user';
diff --git a/database/factories/AlbumFactory.php b/database/factories/AlbumFactory.php
index 2017e0ae..d235906d 100644
--- a/database/factories/AlbumFactory.php
+++ b/database/factories/AlbumFactory.php
@@ -31,8 +31,8 @@
 
 namespace Database\Factories;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
 class AlbumFactory extends Factory
 {
diff --git a/database/factories/GenreFactory.php b/database/factories/GenreFactory.php
index 69014a44..4842867b 100644
--- a/database/factories/GenreFactory.php
+++ b/database/factories/GenreFactory.php
@@ -31,9 +31,8 @@
 
 namespace Database\Factories;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\User;
-
+use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
  * @property int $id
@@ -51,7 +50,6 @@ use App\Models\User;
  * @property string $updated_at
  * @property \Carbon\Carbon $deleted_at
  */
-
 class GenreFactory extends Factory
 {
     /**
diff --git a/database/factories/TrackFactory.php b/database/factories/TrackFactory.php
index 7120d694..8d2790f2 100644
--- a/database/factories/TrackFactory.php
+++ b/database/factories/TrackFactory.php
@@ -31,8 +31,8 @@
 
 namespace Database\Factories;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
 class TrackFactory extends Factory
 {
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 79ce36ad..3fe15915 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -31,8 +31,8 @@
 
 namespace Database\Factories;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
 class UserFactory extends Factory
 {
diff --git a/database/seeders/GenreTableSeeder.php b/database/seeders/GenreTableSeeder.php
index e3279b96..d6689df5 100644
--- a/database/seeders/GenreTableSeeder.php
+++ b/database/seeders/GenreTableSeeder.php
@@ -21,6 +21,7 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
 
 class GenreTableSeeder extends Seeder
 {
diff --git a/database/seeders/ShowSongTableSeeder.php b/database/seeders/ShowSongTableSeeder.php
index 3f621670..4fffb973 100644
--- a/database/seeders/ShowSongTableSeeder.php
+++ b/database/seeders/ShowSongTableSeeder.php
@@ -21,6 +21,7 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
 
 class ShowSongTableSeeder extends Seeder
 {