diff --git a/app/Extensions/DynamicDatabaseConnection.php b/app/Extensions/DynamicDatabaseConnection.php
index 862336f41..18d0001c9 100644
--- a/app/Extensions/DynamicDatabaseConnection.php
+++ b/app/Extensions/DynamicDatabaseConnection.php
@@ -24,9 +24,9 @@
 
 namespace Pterodactyl\Extensions;
 
-use Illuminate\Config\Repository as ConfigRepository;
-use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Models\DatabaseHost;
+use Illuminate\Contracts\Encryption\Encrypter;
+use Illuminate\Config\Repository as ConfigRepository;
 
 class DynamicDatabaseConnection
 {
diff --git a/app/Http/Controllers/Admin/LocationController.php b/app/Http/Controllers/Admin/LocationController.php
index 1dd3bee2e..4a6ffb358 100644
--- a/app/Http/Controllers/Admin/LocationController.php
+++ b/app/Http/Controllers/Admin/LocationController.php
@@ -27,8 +27,8 @@ namespace Pterodactyl\Http\Controllers\Admin;
 use Pterodactyl\Models\Location;
 use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Services\LocationService;
-use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Http\Requests\Admin\LocationRequest;
 
 class LocationController extends Controller
diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php
index afabcfd28..02e40013a 100644
--- a/app/Http/Controllers/Admin/OptionController.php
+++ b/app/Http/Controllers/Admin/OptionController.php
@@ -29,7 +29,6 @@ use Alert;
 use Route;
 use Javascript;
 use Illuminate\Http\Request;
-use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
 use Pterodactyl\Models\Service;
 use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Exceptions\DisplayException;
@@ -37,6 +36,7 @@ use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\OptionRepository;
 use Pterodactyl\Repositories\VariableRepository;
 use Pterodactyl\Exceptions\DisplayValidationException;
+use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
 use Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable;
 
 class OptionController extends Controller
diff --git a/app/Models/Location.php b/app/Models/Location.php
index e7a7cd3f6..8cadda7da 100644
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -24,8 +24,8 @@
 
 namespace Pterodactyl\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
+use Illuminate\Database\Eloquent\Model;
 
 class Location extends Model
 {
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 6a8403ff1..1563e35f6 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,9 +2,9 @@
 
 namespace Pterodactyl\Providers;
 
+use Pterodactyl\Models\User;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
-use Pterodactyl\Models\User;
 
 class RouteServiceProvider extends ServiceProvider
 {
diff --git a/app/Repositories/Repository.php b/app/Repositories/Repository.php
index 37e2c421d..7bf059208 100644
--- a/app/Repositories/Repository.php
+++ b/app/Repositories/Repository.php
@@ -26,8 +26,8 @@ namespace Pterodactyl\Repositories;
 
 use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Model;
-use Pterodactyl\Contracts\Repositories\RepositoryInterface;
 use Pterodactyl\Exceptions\Repository\RepositoryException;
+use Pterodactyl\Contracts\Repositories\RepositoryInterface;
 
 abstract class Repository implements RepositoryInterface
 {
diff --git a/app/Services/UserService.php b/app/Services/UserService.php
index 81119f11b..10b63aed6 100644
--- a/app/Services/UserService.php
+++ b/app/Services/UserService.php
@@ -24,14 +24,14 @@
 
 namespace Pterodactyl\Services;
 
-use Illuminate\Config\Repository as ConfigRepository;
+use Pterodactyl\Models\User;
+use Illuminate\Database\Connection;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Hashing\Hasher;
-use Illuminate\Database\Connection;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Models\User;
 use Pterodactyl\Notifications\AccountCreated;
 use Pterodactyl\Services\Components\UuidService;
+use Illuminate\Config\Repository as ConfigRepository;
 
 class UserService
 {
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index 547152f6a..ab9240255 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -13,7 +13,7 @@ trait CreatesApplication
      */
     public function createApplication()
     {
-        $app = require __DIR__.'/../bootstrap/app.php';
+        $app = require __DIR__ . '/../bootstrap/app.php';
 
         $app->make(Kernel::class)->bootstrap();
 
diff --git a/tests/Feature/Services/LocationServiceTest.php b/tests/Feature/Services/LocationServiceTest.php
index fbf8f8f1d..4b94d6690 100644
--- a/tests/Feature/Services/LocationServiceTest.php
+++ b/tests/Feature/Services/LocationServiceTest.php
@@ -24,12 +24,12 @@
 
 namespace Tests\Feature\Services;
 
-use Illuminate\Validation\ValidationException;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Models\Node;
 use Tests\TestCase;
+use Pterodactyl\Models\Node;
 use Pterodactyl\Models\Location;
 use Pterodactyl\Services\LocationService;
+use Pterodactyl\Exceptions\DisplayException;
+use Illuminate\Validation\ValidationException;
 
 class LocationServiceTest extends TestCase
 {
@@ -65,7 +65,7 @@ class LocationServiceTest extends TestCase
         $this->assertEquals($data['short'], $response->short);
         $this->assertDatabaseHas('locations', [
             'short' => $data['short'],
-            'long' => $data['long']
+            'long' => $data['long'],
         ]);
     }
 
diff --git a/tests/Feature/Services/UserServiceTest.php b/tests/Feature/Services/UserServiceTest.php
index 1f95b53b1..db962b619 100644
--- a/tests/Feature/Services/UserServiceTest.php
+++ b/tests/Feature/Services/UserServiceTest.php
@@ -24,11 +24,11 @@
 
 namespace Tests\Feature\Services;
 
-use Illuminate\Support\Facades\Notification;
-use Pterodactyl\Models\User;
-use Pterodactyl\Notifications\AccountCreated;
-use Pterodactyl\Services\UserService;
 use Tests\TestCase;
+use Pterodactyl\Models\User;
+use Pterodactyl\Services\UserService;
+use Illuminate\Support\Facades\Notification;
+use Pterodactyl\Notifications\AccountCreated;
 
 class UserServiceTest extends TestCase
 {