diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 79853b1..a850d22 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -27,9 +27,11 @@ use Modules\Helper\Models\TemplateMapper;
 
 use Modules\Media\Models\NullCollection;
 use Modules\Media\Models\NullMedia;
+use Modules\Tag\Models\NullTag;
 use phpOMS\Account\PermissionType;
 use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
@@ -38,8 +40,6 @@ use phpOMS\System\MimeType;
 use phpOMS\Utils\Parser\Markdown\Markdown;
 use phpOMS\Utils\StringUtils;
 use phpOMS\Views\View;
-use phpOMS\Message\Http\HttpResponse;
-use Modules\Tag\Models\NullTag;
 
 /**
  * Helper controller class.
diff --git a/Models/TemplateMapper.php b/Models/TemplateMapper.php
index 389c77a..3bc3740 100644
--- a/Models/TemplateMapper.php
+++ b/Models/TemplateMapper.php
@@ -17,8 +17,8 @@ namespace Modules\Helper\Models;
 use Modules\Admin\Models\AccountMapper;
 use Modules\Media\Models\CollectionMapper;
 use Modules\Organization\Models\UnitMapper;
-use phpOMS\DataStorage\Database\DataMapperAbstract;
 use Modules\Tag\Models\TagMapper;
+use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
  * Report mapper class.