diff --git a/src/App.php b/src/App.php
index 57b32e082b..d1b37a1ccd 100644
--- a/src/App.php
+++ b/src/App.php
@@ -23,15 +23,12 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Worker\Repository\Process as ProcessRepository;
-use Friendica\Database\DBA;
 use Friendica\Database\Definition\DbaDefinition;
 use Friendica\Database\Definition\ViewDefinition;
 use Friendica\Module\Maintenance;
-use Friendica\Protocol\ATProtocol\Jetstream;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\System;
diff --git a/src/Console/Daemon.php b/src/Console/Daemon.php
index e1810bb9cb..e57871b262 100644
--- a/src/Console/Daemon.php
+++ b/src/Console/Daemon.php
@@ -99,7 +99,8 @@ HELP;
 		$this->config->reload();
 
 		if (empty($this->config->get('system', 'pidfile'))) {
-			throw new RuntimeException(<<< TXT
+			throw new RuntimeException(
+				<<< TXT
 					Please set system.pidfile in config/local.config.php. For example:
 
 						'system' => [
diff --git a/src/Console/JetstreamDaemon.php b/src/Console/JetstreamDaemon.php
index 1f50a92e50..af54530316 100644
--- a/src/Console/JetstreamDaemon.php
+++ b/src/Console/JetstreamDaemon.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2024, the Friendica project
+// Copyright (C) 2010-2025, the Friendica project
 // SPDX-FileCopyrightText: 2010-2024 the Friendica project
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/src/Core/Console.php b/src/Core/Console.php
index 3fabd92502..b639d68bbb 100644
--- a/src/Core/Console.php
+++ b/src/Core/Console.php
@@ -69,36 +69,36 @@ HELP;
 	}
 
 	protected $subConsoles = [
-		'addon'                  => Friendica\Console\Addon::class,
-		'archivecontact'         => Friendica\Console\ArchiveContact::class,
-		'autoinstall'            => Friendica\Console\AutomaticInstallation::class,
-		'cache'                  => Friendica\Console\Cache::class,
-		'clearavatarcache'       => Friendica\Console\ClearAvatarCache::class,
-		'config'                 => Friendica\Console\Config::class,
-		'contact'                => Friendica\Console\Contact::class,
-		'createdoxygen'          => Friendica\Console\CreateDoxygen::class,
-		'daemon'                 => Friendica\Console\Daemon::class,
-		'jetstream'              => Friendica\Console\JetstreamDaemon::class,
-		'docbloxerrorchecker'    => Friendica\Console\DocBloxErrorChecker::class,
-		'dbstructure'            => Friendica\Console\DatabaseStructure::class,
-		'extract'                => Friendica\Console\Extract::class,
+		'addon'                  			=> Friendica\Console\Addon::class,
+		'archivecontact'         			=> Friendica\Console\ArchiveContact::class,
+		'autoinstall'            			=> Friendica\Console\AutomaticInstallation::class,
+		'cache'                  			=> Friendica\Console\Cache::class,
+		'clearavatarcache'       			=> Friendica\Console\ClearAvatarCache::class,
+		'config'                 			=> Friendica\Console\Config::class,
+		'contact'                			=> Friendica\Console\Contact::class,
+		'createdoxygen'          			=> Friendica\Console\CreateDoxygen::class,
+		'daemon'                 			=> Friendica\Console\Daemon::class,
+		'jetstream'              			=> Friendica\Console\JetstreamDaemon::class,
+		'docbloxerrorchecker'    			=> Friendica\Console\DocBloxErrorChecker::class,
+		'dbstructure'            			=> Friendica\Console\DatabaseStructure::class,
+		'extract'                			=> Friendica\Console\Extract::class,
 		'fixapdeliveryworkertaskparameters' => Friendica\Console\FixAPDeliveryWorkerTaskParameters::class,
-		'globalcommunityblock'   => Friendica\Console\GlobalCommunityBlock::class,
-		'globalcommunitysilence' => Friendica\Console\GlobalCommunitySilence::class,
-		'lock'                   => Friendica\Console\Lock::class,
-		'maintenance'            => Friendica\Console\Maintenance::class,
-		'mergecontacts'          => Friendica\Console\MergeContacts::class,
-		'movetoavatarcache'      => Friendica\Console\MoveToAvatarCache::class,
-		'php2po'                 => Friendica\Console\PhpToPo::class,
-		'postupdate'             => Friendica\Console\PostUpdate::class,
-		'po2php'                 => Friendica\Console\PoToPhp::class,
-		'relay'                  => Friendica\Console\Relay::class,
-		'relocate'               => Friendica\Console\Relocate::class,
-		'serverblock'            => Friendica\Console\ServerBlock::class,
-		'storage'                => Friendica\Console\Storage::class,
-		'test'                   => Friendica\Console\Test::class,
-		'typo'                   => Friendica\Console\Typo::class,
-		'user'                   => Friendica\Console\User::class,
+		'globalcommunityblock'   			=> Friendica\Console\GlobalCommunityBlock::class,
+		'globalcommunitysilence' 			=> Friendica\Console\GlobalCommunitySilence::class,
+		'lock'                   			=> Friendica\Console\Lock::class,
+		'maintenance'            			=> Friendica\Console\Maintenance::class,
+		'mergecontacts'          			=> Friendica\Console\MergeContacts::class,
+		'movetoavatarcache'      			=> Friendica\Console\MoveToAvatarCache::class,
+		'php2po'                 			=> Friendica\Console\PhpToPo::class,
+		'postupdate'             			=> Friendica\Console\PostUpdate::class,
+		'po2php'                 			=> Friendica\Console\PoToPhp::class,
+		'relay'                  			=> Friendica\Console\Relay::class,
+		'relocate'               			=> Friendica\Console\Relocate::class,
+		'serverblock'            			=> Friendica\Console\ServerBlock::class,
+		'storage'                			=> Friendica\Console\Storage::class,
+		'test'                   			=> Friendica\Console\Test::class,
+		'typo'                   			=> Friendica\Console\Typo::class,
+		'user'                   			=> Friendica\Console\User::class,
 	];
 
 	/**
diff --git a/src/Protocol/ATProtocol/Jetstream.php b/src/Protocol/ATProtocol/Jetstream.php
index 1326991f24..cb37fabeec 100755
--- a/src/Protocol/ATProtocol/Jetstream.php
+++ b/src/Protocol/ATProtocol/Jetstream.php
@@ -38,9 +38,9 @@ use stdClass;
  */
 class Jetstream
 {
-	private $uids      = [];
-	private $self      = [];
-	private $capped    = false;
+	private $uids   = [];
+	private $self   = [];
+	private $capped = false;
 
 	/** @var LoggerInterface */
 	private $logger;
@@ -213,8 +213,8 @@ class Jetstream
 
 		if (!$this->capped && count($dids) < $did_limit) {
 			$condition = ["`uid` = ? AND `network` = ? AND EXISTS(SELECT `author-id` FROM `post-user` WHERE `author-id` = `contact`.`id` AND `post-user`.`uid` != ?)", 0, Protocol::BLUESKY, 0];
-			$contacts = Contact::selectToArray(['url'], $condition, ['order' => ['last-item' => true], 'limit' => $did_limit]);
-			$dids     = $this->addDids($contacts, $uids, $did_limit, $dids);
+			$contacts  = Contact::selectToArray(['url'], $condition, ['order' => ['last-item' => true], 'limit' => $did_limit]);
+			$dids      = $this->addDids($contacts, $uids, $did_limit, $dids);
 		}
 
 		$this->keyValue->set('jetstream_did_count', count($dids));
diff --git a/src/System/Daemon.php b/src/System/Daemon.php
index a9bbb22275..d8d658453c 100644
--- a/src/System/Daemon.php
+++ b/src/System/Daemon.php
@@ -1,5 +1,10 @@
 <?php
 
+// Copyright (C) 2010-2025, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 namespace Friendica\System;
 
 use Friendica\Database\Database;
@@ -13,7 +18,7 @@ final class Daemon
 	private LoggerInterface $logger;
 	private Database $dba;
 	private ?string $pidfile = null;
-	private ?int $pid = null;
+	private ?int $pid        = null;
 
 	/**
 	 * The PID of the current daemon (null if either not set or not found)
@@ -91,7 +96,7 @@ final class Daemon
 			if ($this->pid < 0) {
 				$this->logger->warning('Could not fork daemon');
 				return false;
-			} elseif ($this->pid) {
+			} else if ($this->pid) {
 				// The parent process continues here
 				if (!file_put_contents($this->pidfile, $this->pid)) {
 					$this->logger->warning('Could not store pid file', ['pid' => $this->pid, 'pidfile' => $this->pidfile]);