diff --git a/src/command/Command.php b/src/command/Command.php
index 63ecc126fe..3bb291b1a3 100644
--- a/src/command/Command.php
+++ b/src/command/Command.php
@@ -50,9 +50,7 @@ abstract class Command{
 	/** @var string[] */
 	private $aliases = [];
 
-	/**
-	 * @var string[]
-	 */
+	/** @var string[] */
 	private $activeAliases = [];
 
 	/** @var CommandMap|null */
diff --git a/src/command/SimpleCommandMap.php b/src/command/SimpleCommandMap.php
index 1eff4dd702..d36e0ddb24 100644
--- a/src/command/SimpleCommandMap.php
+++ b/src/command/SimpleCommandMap.php
@@ -78,9 +78,7 @@ use function trim;
 
 class SimpleCommandMap implements CommandMap{
 
-	/**
-	 * @var Command[]
-	 */
+	/** @var Command[] */
 	protected $knownCommands = [];
 
 	/** @var Server */
diff --git a/src/event/entity/EntityExplodeEvent.php b/src/event/entity/EntityExplodeEvent.php
index a48bd8646d..19e14f5897 100644
--- a/src/event/entity/EntityExplodeEvent.php
+++ b/src/event/entity/EntityExplodeEvent.php
@@ -38,9 +38,7 @@ class EntityExplodeEvent extends EntityEvent implements Cancellable{
 	/** @var Position */
 	protected $position;
 
-	/**
-	 * @var Block[]
-	 */
+	/** @var Block[] */
 	protected $blocks;
 
 	/** @var float */
diff --git a/src/event/player/PlayerChatEvent.php b/src/event/player/PlayerChatEvent.php
index a7b7162f2c..c385a360a2 100644
--- a/src/event/player/PlayerChatEvent.php
+++ b/src/event/player/PlayerChatEvent.php
@@ -43,9 +43,7 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 	/** @var string */
 	protected $format;
 
-	/**
-	 * @var CommandSender[]
-	 */
+	/** @var CommandSender[] */
 	protected $recipients = [];
 
 	/**
diff --git a/src/permission/BanEntry.php b/src/permission/BanEntry.php
index 6dd3ee032c..a6b322708c 100644
--- a/src/permission/BanEntry.php
+++ b/src/permission/BanEntry.php
@@ -32,9 +32,7 @@ use function strtolower;
 use function trim;
 
 class BanEntry{
-	/**
-	 * @var string
-	 */
+	/** @var string */
 	public static $format = "Y-m-d H:i:s O";
 
 	/** @var string */
diff --git a/src/permission/PermissibleBase.php b/src/permission/PermissibleBase.php
index 167820313d..966bd2031d 100644
--- a/src/permission/PermissibleBase.php
+++ b/src/permission/PermissibleBase.php
@@ -35,14 +35,10 @@ class PermissibleBase implements Permissible{
 	/** @var Permissible */
 	private $parent = null;
 
-	/**
-	 * @var PermissionAttachment[]
-	 */
+	/** @var PermissionAttachment[] */
 	private $attachments = [];
 
-	/**
-	 * @var PermissionAttachmentInfo[]
-	 */
+	/** @var PermissionAttachmentInfo[] */
 	private $permissions = [];
 
 	public function __construct(ServerOperator $opable){
diff --git a/src/permission/Permission.php b/src/permission/Permission.php
index e728e797ba..f617e3e5df 100644
--- a/src/permission/Permission.php
+++ b/src/permission/Permission.php
@@ -45,9 +45,7 @@ class Permission{
 	/** @var string */
 	private $description;
 
-	/**
-	 * @var bool[]
-	 */
+	/** @var bool[] */
 	private $children;
 
 	/** @var string */
diff --git a/src/permission/PermissionAttachment.php b/src/permission/PermissionAttachment.php
index adea709191..2f94742a43 100644
--- a/src/permission/PermissionAttachment.php
+++ b/src/permission/PermissionAttachment.php
@@ -30,9 +30,7 @@ class PermissionAttachment{
 	/** @var PermissionRemovedExecutor */
 	private $removed = null;
 
-	/**
-	 * @var bool[]
-	 */
+	/** @var bool[] */
 	private $permissions = [];
 
 	/** @var Permissible */
diff --git a/src/plugin/PluginDescription.php b/src/plugin/PluginDescription.php
index ec2bfbba2a..ed91692c3a 100644
--- a/src/plugin/PluginDescription.php
+++ b/src/plugin/PluginDescription.php
@@ -73,9 +73,7 @@ class PluginDescription{
 	/** @var PluginLoadOrder */
 	private $order;
 
-	/**
-	 * @var Permission[]
-	 */
+	/** @var Permission[] */
 	private $permissions = [];
 
 	/**
diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php
index 4b13f1d127..76f69ff660 100644
--- a/src/plugin/PluginManager.php
+++ b/src/plugin/PluginManager.php
@@ -67,19 +67,13 @@ class PluginManager{
 	/** @var Server */
 	private $server;
 
-	/**
-	 * @var Plugin[]
-	 */
+	/** @var Plugin[] */
 	protected $plugins = [];
 
-	/**
-	 * @var Plugin[]
-	 */
+	/** @var Plugin[] */
 	protected $enabledPlugins = [];
 
-	/**
-	 * @var PluginLoader[]
-	 */
+	/** @var PluginLoader[] */
 	protected $fileAssociations = [];
 
 	/** @var string|null */
diff --git a/src/scheduler/TaskScheduler.php b/src/scheduler/TaskScheduler.php
index 0700dd9c8e..55b70de0bb 100644
--- a/src/scheduler/TaskScheduler.php
+++ b/src/scheduler/TaskScheduler.php
@@ -36,14 +36,10 @@ class TaskScheduler{
 	/** @var bool */
 	private $enabled = true;
 
-	/**
-	 * @var ReversePriorityQueue<Task>
-	 */
+	/** @var ReversePriorityQueue<Task> */
 	protected $queue;
 
-	/**
-	 * @var TaskHandler[]
-	 */
+	/** @var TaskHandler[] */
 	protected $tasks = [];
 
 	/** @var int */
diff --git a/src/utils/Random.php b/src/utils/Random.php
index 0719dcc2cf..f20e729611 100644
--- a/src/utils/Random.php
+++ b/src/utils/Random.php
@@ -35,24 +35,16 @@ class Random{
 	public const Z = 521288629;
 	public const W = 88675123;
 
-	/**
-	 * @var int
-	 */
+	/** @var int */
 	private $x;
 
-	/**
-	 * @var int
-	 */
+	/** @var int */
 	private $y;
 
-	/**
-	 * @var int
-	 */
+	/** @var int */
 	private $z;
 
-	/**
-	 * @var int
-	 */
+	/** @var int */
 	private $w;
 
 	/** @var int */