diff --git a/application/Espo/Repositories/EmailTemplateCategory.php b/application/Espo/Repositories/EmailTemplateCategory.php
index f26eb54e5e..ec2a17c76f 100644
--- a/application/Espo/Repositories/EmailTemplateCategory.php
+++ b/application/Espo/Repositories/EmailTemplateCategory.php
@@ -29,9 +29,10 @@
 
 namespace Espo\Repositories;
 
+use Espo\Core\Repositories\CategoryTree;
+
 /**
- * @extends \Espo\Core\Repositories\CategoryTree<\Espo\Entities\EmailTemplateCategory>
+ * @extends CategoryTree<\Espo\Entities\EmailTemplateCategory>
  */
-class EmailTemplateCategory extends \Espo\Core\Repositories\CategoryTree
-{
-}
+class EmailTemplateCategory extends CategoryTree
+{}
diff --git a/application/Espo/Repositories/Import.php b/application/Espo/Repositories/Import.php
index c91eacc9c7..8201f3b7c6 100644
--- a/application/Espo/Repositories/Import.php
+++ b/application/Espo/Repositories/Import.php
@@ -32,11 +32,10 @@ namespace Espo\Repositories;
 use Espo\Entities\Import as ImportEntity;
 use Espo\Entities\ImportEntity as ImportEntityEntity;
 
-use Espo\ORM\{
-    Entity,
-    Query\Select as Query,
-    Collection,
-};
+use Espo\ORM\Collection;
+use Espo\ORM\Entity;
+use Espo\ORM\Query\Select as Query;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Entities\Attachment as AttachmentEntity;
 
@@ -99,8 +98,7 @@ class Import extends Database
                 return $query;
         }
 
-        /** @var \Espo\ORM\Query\SelectBuilder $builder */
-        $builder = $this->entityManager->getQueryBuilder()->clone($query);
+        $builder = SelectBuilder::create()->clone($query);
 
         $builder->join(
             'ImportEntity',
diff --git a/application/Espo/Repositories/NextNumber.php b/application/Espo/Repositories/NextNumber.php
index 49041ab31a..4a9e5a03b4 100644
--- a/application/Espo/Repositories/NextNumber.php
+++ b/application/Espo/Repositories/NextNumber.php
@@ -29,10 +29,12 @@
 
 namespace Espo\Repositories;
 
+use Espo\Core\Repositories\Database;
+
 /**
- * @extends \Espo\Core\Repositories\Database<\Espo\Entities\NextNumber>
+ * @extends Database<\Espo\Entities\NextNumber>
  */
-class NextNumber extends \Espo\Core\Repositories\Database
+class NextNumber extends Database
 {
     protected $hooksDisabled = true;
 }
diff --git a/application/Espo/Repositories/User.php b/application/Espo/Repositories/User.php
index de92d0c399..f59013f150 100644
--- a/application/Espo/Repositories/User.php
+++ b/application/Espo/Repositories/User.php
@@ -49,7 +49,7 @@ class User extends Database
 
     /**
      * @param UserEntity $entity
-     * @param array<string,mixed> $options
+     * @param array<string, mixed> $options
      * @return void
      * @throws Conflict
      * @throws Error
@@ -141,7 +141,7 @@ class User extends Database
     }
 
     /**
-     * @param array<string,mixed> $options
+     * @param array<string, mixed> $options
      * @return void
      */
     protected function afterSave(Entity $entity, array $options = [])
@@ -154,7 +154,7 @@ class User extends Database
     }
 
     /**
-     * @param array<string,mixed> $options
+     * @param array<string, mixed> $options
      * @return void
      */
     protected function afterRemove(Entity $entity, array $options = [])
diff --git a/application/Espo/Repositories/Webhook.php b/application/Espo/Repositories/Webhook.php
index 759f730749..0787f3d6a6 100644
--- a/application/Espo/Repositories/Webhook.php
+++ b/application/Espo/Repositories/Webhook.php
@@ -30,10 +30,8 @@
 namespace Espo\Repositories;
 
 use Espo\ORM\Entity;
-
 use Espo\Core\Utils\Util;
-
-use \Espo\Core\Repositories\Database;
+use Espo\Core\Repositories\Database;
 
 /**
  * @extends Database<\Espo\Entities\Webhook>
@@ -74,8 +72,6 @@ class Webhook extends Database
             return;
         }
 
-        $arr = explode('.', $event);
-
         $entityType = $arr[0];
         $type = $arr[1];