diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 8737f4f..dc374b0 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -43,6 +43,9 @@ use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\Http\Rest;
+use phpOMS\Message\Mail\Email;
+use phpOMS\Message\Mail\MailHandler;
+use phpOMS\Message\Mail\SubmitType;
 use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
@@ -57,11 +60,6 @@ use phpOMS\Uri\HttpUri;
 use phpOMS\Utils\Parser\Markdown\Markdown;
 use phpOMS\Validation\Network\Email as EmailValidator;
 use phpOMS\Version\Version;
-use phpOMS\Message\Mail\Email;
-use phpOMS\Message\Mail\Imap;
-use phpOMS\Message\Mail\MailHandler;
-use phpOMS\Message\Mail\SubmitType;
-use phpOMS\System\CharsetType;
 
 /**
  * Admin controller class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index a39b7f2..bed0d0d 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Admin\Controller;
 
+use Model\SettingMapper;
 use Model\SettingsEnum;
 use Modules\Admin\Models\AccountMapper;
 use Modules\Admin\Models\AccountPermissionMapper;
@@ -31,7 +32,6 @@ use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleInfo;
 use phpOMS\Utils\StringUtils;
 use phpOMS\Views\View;
-use Model\SettingMapper;
 
 /**
  * Admin controller class.
@@ -78,7 +78,7 @@ final class BackendController extends Controller
      */
     public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
-        $view     = new View($this->app->l11nManager, $request, $response);
+        $view            = new View($this->app->l11nManager, $request, $response);
         $generalSettings = $this->app->appSettings->get(null, [
                 SettingsEnum::PASSWORD_PATTERN, SettingsEnum::LOGIN_TIMEOUT, SettingsEnum::PASSWORD_INTERVAL, SettingsEnum::PASSWORD_HISTORY, SettingsEnum::LOGIN_TRIES, SettingsEnum::LOGGING_STATUS, SettingsEnum::LOGGING_PATH, SettingsEnum::DEFAULT_ORGANIZATION,
                 SettingsEnum::LOGIN_STATUS, SettingsEnum::DEFAULT_LOCALIZATION, SettingsEnum::ADMIN_MAIL,
@@ -90,8 +90,6 @@ final class BackendController extends Controller
         $view->setData('defaultlocalization', LocalizationMapper::get((int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]));
         $view->setData('settings', SettingMapper::getAll());
 
-
-
         return $view;
     }
 
diff --git a/Models/Address.php b/Models/Address.php
index 385c307..22b0abd 100755
--- a/Models/Address.php
+++ b/Models/Address.php
@@ -49,7 +49,7 @@ class Address extends Location
     {
         $data = parent::toArray();
 
-        $data['name'] = $this->name;
+        $data['name']     = $this->name;
         $data['addition'] = $this->addition;
 
         return $data;
@@ -80,7 +80,7 @@ class Address extends Location
 
         $data = \json_decode($serialized, true);
 
-        $this->name = $data['name'];
+        $this->name     = $data['name'];
         $this->addition = $data['addition'];
     }
 }
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 0add49b..29216b5 100755
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -20,7 +20,7 @@ use phpOMS\Uri\UriFactory;
  * @var \phpOMS\Views\View $this
  */
 $generalSettings = $this->getData('generalSettings') ?? [];
-$settings = $this->getData('settings') ?? [];
+$settings        = $this->getData('settings') ?? [];
 
 $countryCodes    = \phpOMS\Localization\ISO3166TwoEnum::getConstants();
 $countries       = \phpOMS\Localization\ISO3166NameEnum::getConstants();