diff --git a/src/Condition/ConditionHandler.php b/src/Condition/ConditionHandler.php
index 3672a0f..1bec5ed 100644
--- a/src/Condition/ConditionHandler.php
+++ b/src/Condition/ConditionHandler.php
@@ -5,9 +5,15 @@
 namespace IngeniozIT\Router\Condition;
 
 use Closure;
+use IngeniozIT\Router\Condition\Exception\InvalidConditionHandler;
+use IngeniozIT\Router\Condition\Exception\InvalidConditionResponse;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
+use function is_array;
+use function is_callable;
+use function is_string;
+
 readonly final class ConditionHandler
 {
     private Closure $handler;
diff --git a/src/Condition/InvalidConditionHandler.php b/src/Condition/Exception/InvalidConditionHandler.php
similarity index 77%
rename from src/Condition/InvalidConditionHandler.php
rename to src/Condition/Exception/InvalidConditionHandler.php
index b9cba50..1a79fb0 100644
--- a/src/Condition/InvalidConditionHandler.php
+++ b/src/Condition/Exception/InvalidConditionHandler.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router\Condition;
+namespace IngeniozIT\Router\Condition\Exception;
 
+use IngeniozIT\Router\Condition\ConditionException;
 use InvalidArgumentException;
 
 final class InvalidConditionHandler extends InvalidArgumentException implements ConditionException
diff --git a/src/Condition/InvalidConditionResponse.php b/src/Condition/Exception/InvalidConditionResponse.php
similarity index 73%
rename from src/Condition/InvalidConditionResponse.php
rename to src/Condition/Exception/InvalidConditionResponse.php
index 6e68931..0de93f2 100644
--- a/src/Condition/InvalidConditionResponse.php
+++ b/src/Condition/Exception/InvalidConditionResponse.php
@@ -2,10 +2,13 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router\Condition;
+namespace IngeniozIT\Router\Condition\Exception;
 
+use IngeniozIT\Router\Condition\ConditionException;
 use InvalidArgumentException;
 
+use function get_debug_type;
+
 final class InvalidConditionResponse extends InvalidArgumentException implements ConditionException
 {
     public function __construct(public mixed $response)
diff --git a/src/Middleware/Exception/InvalidMiddlewareHandler.php b/src/Middleware/Exception/InvalidMiddlewareHandler.php
new file mode 100644
index 0000000..1576949
--- /dev/null
+++ b/src/Middleware/Exception/InvalidMiddlewareHandler.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Middleware\Exception;
+
+use IngeniozIT\Router\Middleware\MiddlewareException;
+use InvalidArgumentException;
+
+use function get_debug_type;
+
+final class InvalidMiddlewareHandler extends InvalidArgumentException implements MiddlewareException
+{
+    public function __construct(public mixed $handler)
+    {
+        parent::__construct(
+            'Middleware handler must be a PSR Middleware or a callable, ' . get_debug_type($handler) . ' given.'
+        );
+    }
+}
diff --git a/src/Middleware/InvalidMiddlewareResponse.php b/src/Middleware/Exception/InvalidMiddlewareResponse.php
similarity index 72%
rename from src/Middleware/InvalidMiddlewareResponse.php
rename to src/Middleware/Exception/InvalidMiddlewareResponse.php
index 0777d7e..dc2e82c 100644
--- a/src/Middleware/InvalidMiddlewareResponse.php
+++ b/src/Middleware/Exception/InvalidMiddlewareResponse.php
@@ -2,10 +2,13 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router\Middleware;
+namespace IngeniozIT\Router\Middleware\Exception;
 
+use IngeniozIT\Router\Middleware\MiddlewareException;
 use InvalidArgumentException;
 
+use function get_debug_type;
+
 final class InvalidMiddlewareResponse extends InvalidArgumentException implements MiddlewareException
 {
     public function __construct(public mixed $response)
diff --git a/src/Middleware/InvalidMiddlewareHandler.php b/src/Middleware/InvalidMiddlewareHandler.php
deleted file mode 100644
index eb29143..0000000
--- a/src/Middleware/InvalidMiddlewareHandler.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace IngeniozIT\Router\Middleware;
-
-use InvalidArgumentException;
-
-final class InvalidMiddlewareHandler extends InvalidArgumentException implements MiddlewareException
-{
-    public function __construct(public mixed $handler)
-    {
-        parent::__construct('Middleware handler must be a PSR Middleware or a callable, ' . get_debug_type($handler) . ' given.');
-    }
-}
diff --git a/src/Middleware/MiddlewareHandler.php b/src/Middleware/MiddlewareHandler.php
index 36c05f6..d9a70ea 100644
--- a/src/Middleware/MiddlewareHandler.php
+++ b/src/Middleware/MiddlewareHandler.php
@@ -5,12 +5,17 @@
 namespace IngeniozIT\Router\Middleware;
 
 use Closure;
+use IngeniozIT\Router\Middleware\Exception\InvalidMiddlewareHandler;
+use IngeniozIT\Router\Middleware\Exception\InvalidMiddlewareResponse;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+use function is_callable;
+use function is_string;
+
 readonly final class MiddlewareHandler
 {
     private Closure $handler;
diff --git a/src/Route.php b/src/Route.php
index 49bab84..4ef3293 100644
--- a/src/Route.php
+++ b/src/Route.php
@@ -6,6 +6,9 @@
 
 use IngeniozIT\Router\Route\RouteElement;
 
+use function array_reduce;
+use function strtoupper;
+
 final readonly class Route
 {
     public const GET = 0b0000001;
diff --git a/src/Route/Exception/InvalidRouteHandler.php b/src/Route/Exception/InvalidRouteHandler.php
new file mode 100644
index 0000000..db9e91a
--- /dev/null
+++ b/src/Route/Exception/InvalidRouteHandler.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Route\Exception;
+
+use IngeniozIT\Router\Route\RouteException;
+use InvalidArgumentException;
+
+use function get_debug_type;
+
+final class InvalidRouteHandler extends InvalidArgumentException implements RouteException
+{
+    public function __construct(public mixed $handler)
+    {
+        parent::__construct(
+            'Route handler must be a PSR Middleware, a PSR RequestHandler or a callable, ' . get_debug_type(
+                $handler
+            ) . ' given.'
+        );
+    }
+}
diff --git a/src/Route/InvalidRouteParameter.php b/src/Route/Exception/InvalidRouteParameter.php
similarity index 90%
rename from src/Route/InvalidRouteParameter.php
rename to src/Route/Exception/InvalidRouteParameter.php
index d8089ef..aed0768 100644
--- a/src/Route/InvalidRouteParameter.php
+++ b/src/Route/Exception/InvalidRouteParameter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router\Route;
+namespace IngeniozIT\Router\Route\Exception;
 
 use UnexpectedValueException;
 
diff --git a/src/Route/InvalidRouteResponse.php b/src/Route/Exception/InvalidRouteResponse.php
similarity index 73%
rename from src/Route/InvalidRouteResponse.php
rename to src/Route/Exception/InvalidRouteResponse.php
index d44a1fc..d25658b 100644
--- a/src/Route/InvalidRouteResponse.php
+++ b/src/Route/Exception/InvalidRouteResponse.php
@@ -2,10 +2,13 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router\Route;
+namespace IngeniozIT\Router\Route\Exception;
 
+use IngeniozIT\Router\Route\RouteException;
 use InvalidArgumentException;
 
+use function get_debug_type;
+
 final class InvalidRouteResponse extends InvalidArgumentException implements RouteException
 {
     public function __construct(public mixed $response)
diff --git a/src/Route/MissingRouteParameters.php b/src/Route/Exception/MissingRouteParameters.php
similarity index 79%
rename from src/Route/MissingRouteParameters.php
rename to src/Route/Exception/MissingRouteParameters.php
index c6fd1f9..cf416a5 100644
--- a/src/Route/MissingRouteParameters.php
+++ b/src/Route/Exception/MissingRouteParameters.php
@@ -2,9 +2,12 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router\Route;
+namespace IngeniozIT\Router\Route\Exception;
 
 use DomainException;
+use IngeniozIT\Router\Route\RouteException;
+
+use function implode;
 
 final class MissingRouteParameters extends DomainException implements RouteException
 {
diff --git a/src/Route/RouteNotFound.php b/src/Route/Exception/RouteNotFound.php
similarity index 75%
rename from src/Route/RouteNotFound.php
rename to src/Route/Exception/RouteNotFound.php
index 538f6f1..4a80200 100644
--- a/src/Route/RouteNotFound.php
+++ b/src/Route/Exception/RouteNotFound.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router\Route;
+namespace IngeniozIT\Router\Route\Exception;
 
 use DomainException;
+use IngeniozIT\Router\Route\RouteException;
 
 final class RouteNotFound extends DomainException implements RouteException
 {
diff --git a/src/Route/InvalidRouteHandler.php b/src/Route/InvalidRouteHandler.php
deleted file mode 100644
index 932917e..0000000
--- a/src/Route/InvalidRouteHandler.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace IngeniozIT\Router\Route;
-
-use InvalidArgumentException;
-
-final class InvalidRouteHandler extends InvalidArgumentException implements RouteException
-{
-    public function __construct(public mixed $handler)
-    {
-        parent::__construct('Route handler must be a PSR Middleware, a PSR RequestHandler or a callable, ' . get_debug_type($handler) . ' given.');
-    }
-}
diff --git a/src/Route/RouteElement.php b/src/Route/RouteElement.php
index aad62b4..a714978 100644
--- a/src/Route/RouteElement.php
+++ b/src/Route/RouteElement.php
@@ -5,8 +5,22 @@
 namespace IngeniozIT\Router\Route;
 
 use IngeniozIT\Router\Route;
+use IngeniozIT\Router\Route\Exception\InvalidRouteParameter;
+use IngeniozIT\Router\Route\Exception\MissingRouteParameters;
 use Psr\Http\Message\ServerRequestInterface;
 
+use function array_diff;
+use function array_filter;
+use function array_intersect;
+use function array_keys;
+use function count;
+use function http_build_query;
+use function in_array;
+use function preg_match;
+use function preg_match_all;
+use function str_contains;
+use function str_replace;
+
 final readonly class RouteElement
 {
     public string $path;
@@ -147,7 +161,7 @@ private function validatePathParameters(array $parameters): void
         }
 
         foreach ($this->parameters as $parameter) {
-            if (!preg_match('#^' . $this->parameterPattern($parameter) . '$#', (string) $parameters[$parameter])) {
+            if (!preg_match('#^' . $this->parameterPattern($parameter) . '$#', (string)$parameters[$parameter])) {
                 throw new InvalidRouteParameter($this->name ?? '', $parameter, $this->parameterPattern($parameter));
             }
         }
diff --git a/src/Route/RouteHandler.php b/src/Route/RouteHandler.php
index be6b2f8..7f1effa 100644
--- a/src/Route/RouteHandler.php
+++ b/src/Route/RouteHandler.php
@@ -5,12 +5,17 @@
 namespace IngeniozIT\Router\Route;
 
 use Closure;
+use IngeniozIT\Router\Route\Exception\InvalidRouteHandler;
+use IngeniozIT\Router\Route\Exception\InvalidRouteResponse;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+use function is_callable;
+use function is_string;
+
 readonly final class RouteHandler
 {
     private Closure|MiddlewareInterface|RequestHandlerInterface $handler;
diff --git a/src/RouteGroup.php b/src/RouteGroup.php
index ed53340..34b15f8 100644
--- a/src/RouteGroup.php
+++ b/src/RouteGroup.php
@@ -6,6 +6,8 @@
 
 use IngeniozIT\Router\Route\RouteElement;
 
+use function array_map;
+
 final class RouteGroup
 {
     /** @var RouteElement[]|RouteGroup[] */
diff --git a/src/Router.php b/src/Router.php
index 253b989..8880828 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -6,9 +6,9 @@
 
 use IngeniozIT\Router\Condition\ConditionHandler;
 use IngeniozIT\Router\Middleware\MiddlewareHandler;
+use IngeniozIT\Router\Route\Exception\RouteNotFound;
 use IngeniozIT\Router\Route\RouteElement;
 use IngeniozIT\Router\Route\RouteHandler;
-use IngeniozIT\Router\Route\RouteNotFound;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\{ResponseInterface, ServerRequestInterface};
 use Psr\Http\Server\RequestHandlerInterface;
diff --git a/tests/CallbackTest.php b/tests/CallbackTest.php
index 23ebfc2..247af00 100644
--- a/tests/CallbackTest.php
+++ b/tests/CallbackTest.php
@@ -5,8 +5,8 @@
 use Closure;
 use IngeniozIT\Http\Message\UriFactory;
 use IngeniozIT\Router\Route;
-use IngeniozIT\Router\Route\InvalidRouteHandler;
-use IngeniozIT\Router\Route\InvalidRouteResponse;
+use IngeniozIT\Router\Route\Exception\InvalidRouteHandler;
+use IngeniozIT\Router\Route\Exception\InvalidRouteResponse;
 use IngeniozIT\Router\RouteGroup;
 use IngeniozIT\Router\Tests\Utils\RouterCase;
 use IngeniozIT\Router\Tests\Utils\TestHandler;
diff --git a/tests/ConditionsTest.php b/tests/ConditionsTest.php
index 37014f0..89c4fed 100644
--- a/tests/ConditionsTest.php
+++ b/tests/ConditionsTest.php
@@ -4,8 +4,8 @@
 
 use Closure;
 use IngeniozIT\Http\Message\UriFactory;
-use IngeniozIT\Router\Condition\InvalidConditionHandler;
-use IngeniozIT\Router\Condition\InvalidConditionResponse;
+use IngeniozIT\Router\Condition\Exception\InvalidConditionHandler;
+use IngeniozIT\Router\Condition\Exception\InvalidConditionResponse;
 use IngeniozIT\Router\Route;
 use IngeniozIT\Router\RouteGroup;
 use IngeniozIT\Router\Tests\Utils\RouterCase;
diff --git a/tests/MiddlewaresTest.php b/tests/MiddlewaresTest.php
index f23bceb..9279d8c 100644
--- a/tests/MiddlewaresTest.php
+++ b/tests/MiddlewaresTest.php
@@ -4,8 +4,8 @@
 
 use Exception;
 use IngeniozIT\Http\Message\UriFactory;
-use IngeniozIT\Router\Middleware\InvalidMiddlewareHandler;
-use IngeniozIT\Router\Middleware\InvalidMiddlewareResponse;
+use IngeniozIT\Router\Middleware\Exception\InvalidMiddlewareHandler;
+use IngeniozIT\Router\Middleware\Exception\InvalidMiddlewareResponse;
 use IngeniozIT\Router\Route;
 use IngeniozIT\Router\RouteGroup;
 use IngeniozIT\Router\Tests\Utils\RouterCase;
diff --git a/tests/NameTest.php b/tests/NameTest.php
index be1a55e..fb71215 100644
--- a/tests/NameTest.php
+++ b/tests/NameTest.php
@@ -3,9 +3,9 @@
 namespace IngeniozIT\Router\Tests;
 
 use IngeniozIT\Router\Route;
-use IngeniozIT\Router\Route\InvalidRouteParameter;
-use IngeniozIT\Router\Route\MissingRouteParameters;
-use IngeniozIT\Router\Route\RouteNotFound;
+use IngeniozIT\Router\Route\Exception\InvalidRouteParameter;
+use IngeniozIT\Router\Route\Exception\MissingRouteParameters;
+use IngeniozIT\Router\Route\Exception\RouteNotFound;
 use IngeniozIT\Router\RouteGroup;
 use IngeniozIT\Router\Tests\Utils\RouterCase;