diff --git a/src/Arr.php b/src/Arr.php
index 99ac0ba..2fa9187 100644
--- a/src/Arr.php
+++ b/src/Arr.php
@@ -5,8 +5,8 @@ namespace ctiso;
 
 class Arr {
     /**
-     * @param array<mixed> $data
-     * @param string $key
+     * @param array<string|int, mixed> $data
+     * @param string|int $key
      * @param mixed $default
      * @return mixed
      */
diff --git a/src/ComponentRequest.php b/src/ComponentRequest.php
index 9488184..378c375 100644
--- a/src/ComponentRequest.php
+++ b/src/ComponentRequest.php
@@ -2,11 +2,11 @@
 
 namespace ctiso;
 
-use ctiso\HttpRequest,
-    ctiso\Arr;
+use ctiso\HttpRequest;
+use ctiso\Arr;
 
 class ComponentRequest {
-    /** @var string */
+    /** @var int */
     public $component_id;
     /** @var string */
     public $component_title;
@@ -14,7 +14,7 @@ class ComponentRequest {
     public $r;
 
     /**
-     * @param string $c
+     * @param int $c
      * @param HttpRequest $r
      */
     function __construct($c, HttpRequest $r) {
diff --git a/src/Controller/Component.php b/src/Controller/Component.php
index 18d87ea..d4fca32 100644
--- a/src/Controller/Component.php
+++ b/src/Controller/Component.php
@@ -60,7 +60,7 @@ class Component
     public $template = null;
     public string $templatePath;
 
-    /** @var string */
+    /** @var int */
     public $component_id;
     /** @var string */
     public $component_title;
@@ -359,12 +359,9 @@ class Component
         $path = Path::join ($config->get('site', 'components'), $name, $filename . '.php');
         $className = implode("\\", ['Components', ucfirst($name), $filename]);
 
-        /**
-         * @var ?Component $component
-         */
         $component = null;
-
         if (file_exists($path)) {
+            /** @var Component $component */
             $component = new $className();
 
             $component->viewPath = [$config->get('site', 'components') . '/' . $name . '/'];
@@ -372,6 +369,7 @@ class Component
             $component->COMPONENTS_WEB = $config->get('site', 'web') . '/components/';
 
         } else {
+            /** @var Component $component */
             $component = new $className();
             $template = $component->getTemplateName($site->getConfig());