diff --git a/src/Driver/Mysqli/Mysqli.php b/src/Driver/Mysqli/Mysqli.php
index fc1a1c8..402af4d 100644
--- a/src/Driver/Mysqli/Mysqli.php
+++ b/src/Driver/Mysqli/Mysqli.php
@@ -10,8 +10,7 @@
     Query\Generator\SQL,
     Query\Query,
     Query\QueryResult,
-    Query\UpdateQuery
-};
+    Query\UpdateQuery};
 use mysqli_result;
 use mysqli_sql_exception;
 
diff --git a/src/Driver/Mysqli/MysqliException.php b/src/Driver/Mysqli/MysqliException.php
index 05d1053..817b63c 100644
--- a/src/Driver/Mysqli/MysqliException.php
+++ b/src/Driver/Mysqli/MysqliException.php
@@ -3,7 +3,6 @@
 namespace Aternos\Model\Driver\Mysqli;
 
 use Aternos\Model\ModelException;
-use mysqli;
 use mysqli_sql_exception;
 use Throwable;
 
diff --git a/src/Driver/Test/TestDriver.php b/src/Driver/Test/TestDriver.php
index ba47146..089ef99 100644
--- a/src/Driver/Test/TestDriver.php
+++ b/src/Driver/Test/TestDriver.php
@@ -132,7 +132,7 @@ public function save(ModelInterface $model): bool
         $table = $this->getTable($model::getName());
         $entry = $table->getById($model->getId(), $model::getIdField());
         if (!$entry) {
-            $table->addEntry((new TestTableEntry(get_object_vars($model))));
+            $table->addEntry(new TestTableEntry(get_object_vars($model)));
             return true;
         }
         $entry->applyFromModel($model);
diff --git a/src/Driver/Test/TestTable.php b/src/Driver/Test/TestTable.php
index 8de18c3..9825aa6 100644
--- a/src/Driver/Test/TestTable.php
+++ b/src/Driver/Test/TestTable.php
@@ -203,12 +203,7 @@ public function clear(): static
      */
     public function getById(mixed $id, string $idField = "id"): ?TestTableEntry
     {
-        foreach ($this->entries as $entry) {
-            if ($entry->hasId($id, $idField)) {
-                return $entry;
-            }
-        }
-        return null;
+        return array_find($this->entries, fn($entry) => $entry->hasId($id, $idField));
     }
 
     /**
diff --git a/src/Driver/Test/TestTableEntryGroup.php b/src/Driver/Test/TestTableEntryGroup.php
index 3dfae7c..e51acef 100644
--- a/src/Driver/Test/TestTableEntryGroup.php
+++ b/src/Driver/Test/TestTableEntryGroup.php
@@ -48,12 +48,7 @@ public function addEntry(TestTableEntry $entry): static
      */
     public function matches(TestTableEntry $entry): bool
     {
-        foreach ($this->conditions as $key => $value) {
-            if ($entry[$key] !== $value) {
-                return false;
-            }
-        }
-        return true;
+        return array_all($this->conditions, fn($value, $key) => $entry[$key] === $value);
     }
 
     /**
diff --git a/src/Query/Generator/SQL.php b/src/Query/Generator/SQL.php
index 86394a1..c37ca9a 100644
--- a/src/Query/Generator/SQL.php
+++ b/src/Query/Generator/SQL.php
@@ -14,7 +14,6 @@
     UpdateQuery,
     WhereCondition,
     WhereGroup};
-use UnexpectedValueException;
 
 /**
  * Class SQL
diff --git a/test/src/TestModel.php b/test/src/TestModel.php
index 54ef7aa..f091c5a 100644
--- a/test/src/TestModel.php
+++ b/test/src/TestModel.php
@@ -2,7 +2,9 @@
 
 namespace Aternos\Model\Test\Src;
 
-class TestModel extends \Aternos\Model\GenericModel
+use Aternos\Model\GenericModel;
+
+class TestModel extends GenericModel
 {
     public mixed $id;
     public ?string $text = null;
diff --git a/test/tests/SQLTest.php b/test/tests/SQLTest.php
index 6e2c39e..10c0444 100644
--- a/test/tests/SQLTest.php
+++ b/test/tests/SQLTest.php
@@ -191,7 +191,7 @@ public function testSelectOrder()
     public function testSelectCount()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::COUNT),
+            new SelectField('number')->setFunction(AggregateFunction::COUNT),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -201,7 +201,7 @@ public function testSelectCount()
     public function testSelectCountStar()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('*'))->setFunction(AggregateFunction::COUNT),
+            new SelectField('*')->setFunction(AggregateFunction::COUNT),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -211,7 +211,7 @@ public function testSelectCountStar()
     public function testSelectSum()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::SUM),
+            new SelectField('number')->setFunction(AggregateFunction::SUM),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -221,7 +221,7 @@ public function testSelectSum()
     public function testSelectSumAs()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::SUM)->setAlias('sum'),
+            new SelectField('number')->setFunction(AggregateFunction::SUM)->setAlias('sum'),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -231,7 +231,7 @@ public function testSelectSumAs()
     public function testSelectAVG()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::AVERAGE),
+            new SelectField('number')->setFunction(AggregateFunction::AVERAGE),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -241,7 +241,7 @@ public function testSelectAVG()
     public function testSelectMin()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::MIN),
+            new SelectField('number')->setFunction(AggregateFunction::MIN),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -251,7 +251,7 @@ public function testSelectMin()
     public function testSelectMinAs()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::MIN)->setAlias('minNumber'),
+            new SelectField('number')->setFunction(AggregateFunction::MIN)->setAlias('minNumber'),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -261,7 +261,7 @@ public function testSelectMinAs()
     public function testSelectMax()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::MAX),
+            new SelectField('number')->setFunction(AggregateFunction::MAX),
         ]);
         $query->modelClassName = TestModel::class;
 
@@ -271,7 +271,7 @@ public function testSelectMax()
     public function testSelectMaxAs()
     {
         $query = new SelectQuery(fields: [
-            (new SelectField('number'))->setFunction(AggregateFunction::MAX)->setAlias('maxNumber'),
+            new SelectField('number')->setFunction(AggregateFunction::MAX)->setAlias('maxNumber'),
         ]);
         $query->modelClassName = TestModel::class;
 
diff --git a/test/tests/TestDriverTest.php b/test/tests/TestDriverTest.php
index 598f9bb..4f2a0bb 100644
--- a/test/tests/TestDriverTest.php
+++ b/test/tests/TestDriverTest.php
@@ -380,7 +380,7 @@ public function testSelectSum(): void
     public function testSelectAverage(): void
     {
         $result = TestModel::select(fields: [
-            (new SelectField("number"))
+            new SelectField("number")
                 ->setAlias("average")
                 ->setFunction(AggregateFunction::AVERAGE)]);
         $this->assertEquals(4.5, $result[0]->getField("average"));
@@ -426,7 +426,7 @@ public function testSelectGroupSum(): void
         $model->save();
 
         $models = TestModel::select(fields: [
-            (new SumField("number"))->setAlias("sum"),
+            new SumField("number")->setAlias("sum"),
             new SelectField("number")],
             group: ["number"]
         );
@@ -449,7 +449,7 @@ public function testSelectGroupAverage(): void
         $model->save();
 
         $models = TestModel::select(fields: [
-            (new SelectField("number"))
+            new SelectField("number")
                 ->setAlias("average")
                 ->setFunction(AggregateFunction::AVERAGE),
             new SelectField("number"),