diff --git a/Models/AccountRelation.php b/Models/AccountRelation.php
index 8ba5f97..5f6e13e 100644
--- a/Models/AccountRelation.php
+++ b/Models/AccountRelation.php
@@ -62,8 +62,6 @@ class AccountRelation
     /**
      * Constructor.
      *
-     * @param string $name Event name/title
-     *
      * @since 1.0.0
      */
     public function __construct()
diff --git a/Models/Event.php b/Models/Event.php
index 8e394a0..c60f5e9 100755
--- a/Models/Event.php
+++ b/Models/Event.php
@@ -193,15 +193,15 @@ class Event
      */
     public function __construct(string $name = '')
     {
-        $this->start     = new \DateTime('now');
-        $this->end       = (new \DateTime('now'))->modify('+1 month');
-        $this->calendar  = new Calendar();
-        $this->budgetCosts     = new Money();
-        $this->budgetEarnings    = new Money();
-        $this->actualCosts  = new Money();
-        $this->actualEarnings  = new Money();
-        $this->createdAt = new \DateTimeImmutable('now');
-        $this->createdBy = new NullAccount();
+        $this->start          = new \DateTime('now');
+        $this->end            = (new \DateTime('now'))->modify('+1 month');
+        $this->calendar       = new Calendar();
+        $this->budgetCosts    = new Money();
+        $this->budgetEarnings = new Money();
+        $this->actualCosts    = new Money();
+        $this->actualEarnings = new Money();
+        $this->createdAt      = new \DateTimeImmutable('now');
+        $this->createdBy      = new NullAccount();
 
         $this->name = $name;
     }
diff --git a/Models/EventAttribute.php b/Models/EventAttribute.php
index 2972513..f01722d 100644
--- a/Models/EventAttribute.php
+++ b/Models/EventAttribute.php
@@ -88,7 +88,7 @@ class EventAttribute implements \JsonSerializable, ArrayableInterface
     {
         return [
             'id'    => $this->id,
-            'item'  => $this->item,
+            'event' => $this->event,
             'type'  => $this->type,
             'value' => $this->value,
         ];
diff --git a/Models/EventAttributeType.php b/Models/EventAttributeType.php
index 2ead951..c1bb70a 100644
--- a/Models/EventAttributeType.php
+++ b/Models/EventAttributeType.php
@@ -105,7 +105,7 @@ class EventAttributeType implements \JsonSerializable, ArrayableInterface
      * Set l11n
      *
      * @param string|EventAttributeTypeL11n $l11n Tag article l11n
-     * @param string                       $lang Language
+     * @param string                        $lang Language
      *
      * @return void
      *
diff --git a/Models/EventAttributeTypeL11n.php b/Models/EventAttributeTypeL11n.php
index f4cab5c..72be19a 100644
--- a/Models/EventAttributeTypeL11n.php
+++ b/Models/EventAttributeTypeL11n.php
@@ -63,8 +63,8 @@ class EventAttributeTypeL11n implements \JsonSerializable, ArrayableInterface
      * Constructor.
      *
      * @param int|EventAttributeType $type     Attribute type
-     * @param string                $title    Localized title
-     * @param string                $language Language
+     * @param string                 $title    Localized title
+     * @param string                 $language Language
      *
      * @since 1.0.0
      */
diff --git a/Models/EventAttributeValueMapper.php b/Models/EventAttributeValueMapper.php
index 93037f3..c0b92e6 100644
--- a/Models/EventAttributeValueMapper.php
+++ b/Models/EventAttributeValueMapper.php
@@ -8,7 +8,7 @@
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
- * @link      https:   //orange-management.org
+ * @link      https://orange-management.org
  */
 declare(strict_types=1);
 
@@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  *
  * @package Modules\EventManagement\Models
  * @license OMS License 1.0
- * @link    https:   //orange-management.org
+ * @link    https://orange-management.org
  * @since   1.0.0
  */
 final class EventAttributeValueMapper extends DataMapperFactory