diff --git a/Application/ApplicationManager.php b/Application/ApplicationManager.php
index 9398b97d6..443484def 100644
--- a/Application/ApplicationManager.php
+++ b/Application/ApplicationManager.php
@@ -147,7 +147,7 @@ final class ApplicationManager
         return $providing;
     }
 
-     /**
+    /**
      * Get all installed modules.
      *
      * @param bool $useCache Use Cache
diff --git a/Application/InstallerAbstract.php b/Application/InstallerAbstract.php
index a05a8f9fd..61347d46c 100644
--- a/Application/InstallerAbstract.php
+++ b/Application/InstallerAbstract.php
@@ -16,7 +16,6 @@ namespace phpOMS\Application;
 
 use phpOMS\Config\SettingsInterface;
 use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
 use phpOMS\System\File\Local\Directory;
 
diff --git a/Application/StatusAbstract.php b/Application/StatusAbstract.php
index 2ad56c754..4888083e6 100644
--- a/Application/StatusAbstract.php
+++ b/Application/StatusAbstract.php
@@ -15,11 +15,10 @@ declare(strict_types=1);
 namespace phpOMS\Application;
 
 use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\Utils\Parser\Php\ArrayParser;
-use phpOMS\System\File\PermissionException;
 use phpOMS\System\File\PathException;
+use phpOMS\System\File\PermissionException;
 use phpOMS\Utils\ArrayUtils;
+use phpOMS\Utils\Parser\Php\ArrayParser;
 
 /**
  * Status abstract class.
diff --git a/Localization/L11nManager.php b/Localization/L11nManager.php
index 037341682..a63f9084a 100644
--- a/Localization/L11nManager.php
+++ b/Localization/L11nManager.php
@@ -98,8 +98,8 @@ final class L11nManager
     /**
      * Load language file which contains multiple languages.
      *
-     * @param string $from     Module name
-     * @param string $file     File to import language from
+     * @param string $from Module name
+     * @param string $file File to import language from
      *
      * @return void
      *
diff --git a/Module/InstallerAbstract.php b/Module/InstallerAbstract.php
index 14b32f833..e63f63e38 100644
--- a/Module/InstallerAbstract.php
+++ b/Module/InstallerAbstract.php
@@ -17,7 +17,6 @@ namespace phpOMS\Module;
 use phpOMS\Application\ApplicationInfo;
 use phpOMS\Config\SettingsInterface;
 use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
 
 /**
diff --git a/Module/StatusAbstract.php b/Module/StatusAbstract.php
index 79356870d..89ce3accc 100644
--- a/Module/StatusAbstract.php
+++ b/Module/StatusAbstract.php
@@ -16,7 +16,6 @@ namespace phpOMS\Module;
 
 use phpOMS\Application\ApplicationInfo;
 use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\System\File\Local\Directory;
 use phpOMS\System\File\Local\File;
 use phpOMS\System\File\PathException;