diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99b84d005..2602c0711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,7 @@
 - Enh #393: Refactor according changes in `db` package (@Tigrov)
 - New #391: Add `caseSensitive` option to like condition (@vjik)
 - Enh #396: Remove `getCacheKey()` and `getCacheTag()` methods from `Schema` class (@Tigrov)
-- Enh #403: Use `DbArrayHelper::arrange()` instead of `DbArrayHelper::index()` method (@Tigrov)
+- Enh #403, #404: Use `DbArrayHelper::arrange()` instead of `DbArrayHelper::index()` method (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 
diff --git a/src/Schema.php b/src/Schema.php
index 4cf83cf74..fb79aea19 100644
--- a/src/Schema.php
+++ b/src/Schema.php
@@ -301,15 +301,13 @@ protected function loadTableIndexes(string $tableName): array
             ':tableName' => $resolvedName->getName(),
         ])->queryAll();
 
-        /** @psalm-var array[] $indexes */
         $indexes = array_map(array_change_key_case(...), $indexes);
         $indexes = DbArrayHelper::arrange($indexes, ['name']);
         $result = [];
 
         /**
-         * @psalm-var object|string|null $name
-         * @psalm-var array<
-         *   array-key,
+         * @var string $name
+         * @psalm-var list<
          *   array{
          *     name: string,
          *     column_name: string,
@@ -841,7 +839,6 @@ private function loadTableConstraints(string $tableName, string $returnType): ar
             ':tableName' => $resolvedName->getName(),
         ])->queryAll();
 
-        /** @psalm-var array[][] $constraints */
         $constraints = array_map(array_change_key_case(...), $constraints);
         $constraints = DbArrayHelper::arrange($constraints, ['type', 'name']);
 
@@ -852,10 +849,6 @@ private function loadTableConstraints(string $tableName, string $returnType): ar
             self::CHECKS => [],
         ];
 
-        /**
-         * @psalm-var string $type
-         * @psalm-var array $names
-         */
         foreach ($constraints as $type => $names) {
             /**
              * @psalm-var object|string|null $name