diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 56c60f5..318a581 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -36,7 +36,7 @@ class Navigation
      *
      * @since  1.0.0
      */
-    public static function install(string $path = null, DatabasePool $dbPool = null) /* : void */
+    public static function install(string $path = null, DatabasePool $dbPool = null) : void
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
diff --git a/Controller.php b/Controller.php
index c081c2f..2f54f68 100644
--- a/Controller.php
+++ b/Controller.php
@@ -374,7 +374,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK)
@@ -536,7 +536,7 @@ class Controller extends ModuleAbstract implements WebInterface
      *
      * @since  1.0.0
      */
-    public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
+    public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
             PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK)
diff --git a/Models/Task.php b/Models/Task.php
index d0dc2a1..b82644b 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -183,7 +183,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setClosable(bool $closable) /* : void */
+    public function setClosable(bool $closable) : void
     {
         $this->isClosable = $closable;
     }
@@ -241,7 +241,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function addMedia($media) /* : void */
+    public function addMedia($media) : void
     {
         $this->media[] = $media;
     }
@@ -309,7 +309,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setStart(\DateTime $start) /* : void */
+    public function setStart(\DateTime $start) : void
     {
         $this->start = $start;
     }
@@ -335,7 +335,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setCreatedBy($id) /* : void */
+    public function setCreatedBy($id) : void
     {
         $this->createdBy = $id;
         $this->schedule->setCreatedBy($id);
@@ -362,7 +362,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setDescription(string $description) /* : void */
+    public function setDescription(string $description) : void
     {
         $this->description = $description;
     }
@@ -414,7 +414,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setDone(\DateTime $done) /* : void */
+    public function setDone(\DateTime $done) : void
     {
         $this->done = $done;
     }
@@ -440,7 +440,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setDue(\DateTime $due) /* : void */
+    public function setDue(\DateTime $due) : void
     {
         $this->due = $due;
     }
@@ -480,7 +480,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setStatus(int $status) /* : void */
+    public function setStatus(int $status) : void
     {
         if (!TaskStatus::isValidValue($status)) {
             throw new InvalidEnumValue((string) $status);
@@ -512,7 +512,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setPriority(int $priority) /* : void */
+    public function setPriority(int $priority) : void
     {
         if (!TaskPriority::isValidValue($priority)) {
             throw new InvalidEnumValue((string) $priority);
@@ -542,7 +542,7 @@ class Task implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setTitle(string $title) /* : void */
+    public function setTitle(string $title) : void
     {
         $this->title = $title;
     }
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
index 6300812..bcf625b 100644
--- a/Models/TaskElement.php
+++ b/Models/TaskElement.php
@@ -172,7 +172,7 @@ class TaskElement implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function addMedia($media) /* : void */
+    public function addMedia($media) : void
     {
         $this->media[] = $media;
     }
@@ -197,7 +197,7 @@ class TaskElement implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setDescription(string $description) /* : void */
+    public function setDescription(string $description) : void
     {
         $this->description = $description;
     }
@@ -223,7 +223,7 @@ class TaskElement implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setDescriptionRaw(string $description) /* : void */
+    public function setDescriptionRaw(string $description) : void
     {
         $this->descriptionRaw = $description;
     }
@@ -249,7 +249,7 @@ class TaskElement implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setDue(\DateTime $due) /* : void */
+    public function setDue(\DateTime $due) : void
     {
         $this->due = $due;
     }
@@ -275,7 +275,7 @@ class TaskElement implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setForwarded($forwarded) /* : void */
+    public function setForwarded($forwarded) : void
     {
         $this->forwarded = $forwarded;
     }
@@ -315,7 +315,7 @@ class TaskElement implements \JsonSerializable
      *
      * @since  1.0.0
      */
-    public function setStatus(int $status) /* : void */
+    public function setStatus(int $status) : void
     {
         if (!TaskStatus::isValidValue($status)) {
             throw new InvalidEnumValue((string) $status);