diff --git a/application/Espo/Core/Entities/Person.php b/application/Espo/Core/Entities/Person.php
index 6ab165a5e4..d77d738ba8 100644
--- a/application/Espo/Core/Entities/Person.php
+++ b/application/Espo/Core/Entities/Person.php
@@ -151,37 +151,27 @@ class Person extends Entity
 
     public function setFirstName(?string $firstName): self
     {
-        $this->set('firstName', $firstName);
-
-        return $this;
+        return $this->set('firstName', $firstName);
     }
 
     public function setLastName(?string $lastName): self
     {
-        $this->set('lastName', $lastName);
-
-        return $this;
+        return $this->set('lastName', $lastName);
     }
 
     public function setMiddleName(?string $middleName): self
     {
-        $this->set('middleName', $middleName);
-
-        return $this;
+        return $this->set('middleName', $middleName);
     }
 
     public function setEmailAddressGroup(EmailAddressGroup $group): self
     {
-        $this->setValueObject('emailAddress', $group);
-
-        return $this;
+        return $this->setValueObject('emailAddress', $group);
     }
 
     public function setPhoneNumberGroup(PhoneNumberGroup $group): self
     {
-        $this->setValueObject('phoneNumber', $group);
-
-        return $this;
+        return $this->setValueObject('phoneNumber', $group);
     }
 
     public function getAddress(): Address
@@ -192,8 +182,6 @@ class Person extends Entity
 
     public function setAddress(Address $address): self
     {
-        $this->setValueObject('address', $address);
-
-        return $this;
+        return $this->setValueObject('address', $address);
     }
 }
diff --git a/application/Espo/Entities/ActionHistoryRecord.php b/application/Espo/Entities/ActionHistoryRecord.php
index f07093b708..2b64a1c8c9 100644
--- a/application/Espo/Entities/ActionHistoryRecord.php
+++ b/application/Espo/Entities/ActionHistoryRecord.php
@@ -47,37 +47,27 @@ class ActionHistoryRecord extends Entity
      */
     public function setAction(string $action): self
     {
-        $this->set('action', $action);
-
-        return $this;
+        return $this->set('action', $action);
     }
 
     public function setUserId(string $userId): self
     {
-        $this->set('userId', $userId);
-
-        return $this;
+        return $this->set('userId', $userId);
     }
 
     public function setIpAddress(?string $ipAddress): self
     {
-        $this->set('ipAddress', $ipAddress);
-
-        return $this;
+        return $this->set('ipAddress', $ipAddress);
     }
 
     public function setAuthTokenId(?string $authTokenId): self
     {
-        $this->set('authTokenId', $authTokenId);
-
-        return $this;
+        return $this->set('authTokenId', $authTokenId);
     }
 
     public function setAuthLogRecordId(?string $authLogRecordId): self
     {
-        $this->set('authLogRecordId', $authLogRecordId);
-
-        return $this;
+        return $this->set('authLogRecordId', $authLogRecordId);
     }
 
     public function setTarget(LinkParent $target): self
diff --git a/application/Espo/Entities/Job.php b/application/Espo/Entities/Job.php
index 7dc9fbd9a5..7fa1ab0195 100644
--- a/application/Espo/Entities/Job.php
+++ b/application/Espo/Entities/Job.php
@@ -186,9 +186,7 @@ class Job extends Entity
      */
     public function setStatus(string $status): self
     {
-        $this->set('status', $status);
-
-        return $this;
+        return $this->set('status', $status);
     }
 
     /**
@@ -196,9 +194,7 @@ class Job extends Entity
      */
     public function setPid(?int $pid): self
     {
-        $this->set('pid', $pid);
-
-        return $this;
+        return $this->set('pid', $pid);
     }
 
     /**
@@ -206,9 +202,7 @@ class Job extends Entity
      */
     public function setStartedAtNow(): self
     {
-        $this->set('startedAt', DateTimeUtil::getSystemNowString());
-
-        return $this;
+        return $this->set('startedAt', DateTimeUtil::getSystemNowString());
     }
 
     /**
@@ -216,8 +210,6 @@ class Job extends Entity
      */
     public function setExecutedAtNow(): self
     {
-        $this->set('executedAt', DateTimeUtil::getSystemNowString());
-
-        return $this;
+        return $this->set('executedAt', DateTimeUtil::getSystemNowString());
     }
 }
diff --git a/application/Espo/Entities/Note.php b/application/Espo/Entities/Note.php
index 7323d9b015..5417380fa4 100644
--- a/application/Espo/Entities/Note.php
+++ b/application/Espo/Entities/Note.php
@@ -221,9 +221,7 @@ class Note extends Entity
 
     public function setType(string $type): self
     {
-        $this->set('type', $type);
-
-        return $this;
+        return $this->set('type', $type);
     }
 
     public function setParent(LinkParent|Entity $parent): self
@@ -278,9 +276,7 @@ class Note extends Entity
      */
     public function setData(stdClass|array $data): self
     {
-        $this->set('data', $data);
-
-        return $this;
+        return $this->set('data', $data);
     }
 
     public function loadAdditionalFields(): void
@@ -334,9 +330,7 @@ class Note extends Entity
      */
     public function setTeamsIds(array $ids): self
     {
-        $this->set('teamsIds', $ids);
-
-        return $this;
+        return $this->set('teamsIds', $ids);
     }
 
     /**
@@ -344,9 +338,7 @@ class Note extends Entity
      */
     public function setUsersIds(array $ids): self
     {
-        $this->set('usersIds', $ids);
-
-        return $this;
+        return $this->set('usersIds', $ids);
     }
 
     public function isPinned(): bool