diff --git a/src/Http/Middleware/ShareErrorsFromSession.php b/src/Http/Middleware/ShareErrorsFromSession.php
index 87c2b845a..6f03c6215 100644
--- a/src/Http/Middleware/ShareErrorsFromSession.php
+++ b/src/Http/Middleware/ShareErrorsFromSession.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *
diff --git a/src/User/Command/DeleteAvatarHandler.php b/src/User/Command/DeleteAvatarHandler.php
index 91b0dd50d..25eb3b39f 100644
--- a/src/User/Command/DeleteAvatarHandler.php
+++ b/src/User/Command/DeleteAvatarHandler.php
@@ -16,7 +16,6 @@ use Flarum\User\AssertPermissionTrait;
 use Flarum\User\AvatarUploader;
 use Flarum\User\Event\AvatarDeleting;
 use Flarum\User\UserRepository;
-use Flarum\Event\AvatarWillBeDeleted;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteAvatarHandler
diff --git a/src/User/Command/EditUserHandler.php b/src/User/Command/EditUserHandler.php
index 7dd0cd3dc..3554038b5 100644
--- a/src/User/Command/EditUserHandler.php
+++ b/src/User/Command/EditUserHandler.php
@@ -12,9 +12,9 @@
 namespace Flarum\User\Command;
 
 use Exception;
-use Flarum\User\AvatarUploader;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
+use Flarum\User\AvatarUploader;
 use Flarum\User\Event\GroupsChanged;
 use Flarum\User\Event\Saving;
 use Flarum\User\User;
diff --git a/src/User/Command/RegisterUserHandler.php b/src/User/Command/RegisterUserHandler.php
index 977766fce..fdd95b434 100644
--- a/src/User/Command/RegisterUserHandler.php
+++ b/src/User/Command/RegisterUserHandler.php
@@ -12,11 +12,11 @@
 namespace Flarum\User\Command;
 
 use Exception;
-use Flarum\User\AvatarUploader;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\AssertPermissionTrait;
 use Flarum\User\AuthToken;
+use Flarum\User\AvatarUploader;
 use Flarum\User\Event\Saving;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\User\User;
diff --git a/src/User/Listener/SelfDemotionGuard.php b/src/User/Listener/SelfDemotionGuard.php
index d45d8ccb8..f4aaf4276 100644
--- a/src/User/Listener/SelfDemotionGuard.php
+++ b/src/User/Listener/SelfDemotionGuard.php
@@ -11,9 +11,9 @@
 
 namespace Flarum\User\Listener;
 
+use Flarum\User\Event\Saving;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Group\Group;
-use Flarum\User\Event\Saving;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class SelfDemotionGuard