diff --git a/src/pocketmine/Achievement.php b/src/pocketmine/Achievement.php
index 456433fc6..365e27349 100644
--- a/src/pocketmine/Achievement.php
+++ b/src/pocketmine/Achievement.php
@@ -30,9 +30,7 @@ use pocketmine\utils\TextFormat;
  * Handles the achievement list and a bit more
  */
 abstract class Achievement{
-	/**
-	 * @var array[]
-	 */
+	/** @var array[] */
 	public static $list = [
 		/*"openInventory" => array(
 			"name" => "Taking Inventory",
diff --git a/src/pocketmine/command/Command.php b/src/pocketmine/command/Command.php
index c45896ea7..4b26c2b9c 100644
--- a/src/pocketmine/command/Command.php
+++ b/src/pocketmine/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/pocketmine/command/SimpleCommandMap.php b/src/pocketmine/command/SimpleCommandMap.php
index c9ff82f7d..a6e9a6100 100644
--- a/src/pocketmine/command/SimpleCommandMap.php
+++ b/src/pocketmine/command/SimpleCommandMap.php
@@ -79,9 +79,7 @@ use function trim;
 
 class SimpleCommandMap implements CommandMap{
 
-	/**
-	 * @var Command[]
-	 */
+	/** @var Command[] */
 	protected $knownCommands = [];
 
 	/** @var Server */
diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 4c42aabef..a451a06be 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -430,9 +430,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		]);
 	}
 
-	/**
-	 * @var Player[]
-	 */
+	/** @var Player[] */
 	protected $hasSpawned = [];
 
 	/** @var int */
diff --git a/src/pocketmine/event/HandlerList.php b/src/pocketmine/event/HandlerList.php
index b821ed6e8..270832812 100644
--- a/src/pocketmine/event/HandlerList.php
+++ b/src/pocketmine/event/HandlerList.php
@@ -31,9 +31,7 @@ use function in_array;
 use function spl_object_hash;
 
 class HandlerList{
-	/**
-	 * @var HandlerList[] classname => HandlerList
-	 */
+	/** @var HandlerList[] classname => HandlerList */
 	private static $allLists = [];
 
 	/**
diff --git a/src/pocketmine/event/entity/EntityExplodeEvent.php b/src/pocketmine/event/entity/EntityExplodeEvent.php
index 270100d47..4d920a3d2 100644
--- a/src/pocketmine/event/entity/EntityExplodeEvent.php
+++ b/src/pocketmine/event/entity/EntityExplodeEvent.php
@@ -35,9 +35,7 @@ class EntityExplodeEvent extends EntityEvent implements Cancellable{
 	/** @var Position */
 	protected $position;
 
-	/**
-	 * @var Block[]
-	 */
+	/** @var Block[] */
 	protected $blocks;
 
 	/** @var float */
diff --git a/src/pocketmine/event/player/PlayerChatEvent.php b/src/pocketmine/event/player/PlayerChatEvent.php
index ab97e66ce..cc53447b3 100644
--- a/src/pocketmine/event/player/PlayerChatEvent.php
+++ b/src/pocketmine/event/player/PlayerChatEvent.php
@@ -40,9 +40,7 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 	/** @var string */
 	protected $format;
 
-	/**
-	 * @var CommandSender[]
-	 */
+	/** @var CommandSender[] */
 	protected $recipients = [];
 
 	/**
diff --git a/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php b/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php
index 8e2e53f67..6f54a5a44 100644
--- a/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php
+++ b/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php
@@ -30,9 +30,7 @@ use pocketmine\network\SourceInterface;
  * @deprecated
  */
 class NetworkInterfaceCrashEvent extends NetworkInterfaceEvent{
-	/**
-	 * @var \Throwable
-	 */
+	/** @var \Throwable */
 	private $exception;
 
 	public function __construct(SourceInterface $interface, \Throwable $throwable){
diff --git a/src/pocketmine/permission/BanEntry.php b/src/pocketmine/permission/BanEntry.php
index be963ccde..ddda2f511 100644
--- a/src/pocketmine/permission/BanEntry.php
+++ b/src/pocketmine/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/pocketmine/permission/PermissibleBase.php b/src/pocketmine/permission/PermissibleBase.php
index 788ccee74..0b7e44e52 100644
--- a/src/pocketmine/permission/PermissibleBase.php
+++ b/src/pocketmine/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/pocketmine/permission/Permission.php b/src/pocketmine/permission/Permission.php
index b672dae69..201ced4b5 100644
--- a/src/pocketmine/permission/Permission.php
+++ b/src/pocketmine/permission/Permission.php
@@ -132,9 +132,7 @@ class Permission{
 	/** @var string */
 	private $description;
 
-	/**
-	 * @var bool[]
-	 */
+	/** @var bool[] */
 	private $children;
 
 	/** @var string */
diff --git a/src/pocketmine/permission/PermissionAttachment.php b/src/pocketmine/permission/PermissionAttachment.php
index 09710620c..2eb059461 100644
--- a/src/pocketmine/permission/PermissionAttachment.php
+++ b/src/pocketmine/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/pocketmine/plugin/PluginDescription.php b/src/pocketmine/plugin/PluginDescription.php
index dc07500ef..3e8dca98d 100644
--- a/src/pocketmine/plugin/PluginDescription.php
+++ b/src/pocketmine/plugin/PluginDescription.php
@@ -75,9 +75,7 @@ class PluginDescription{
 	/** @var int */
 	private $order = PluginLoadOrder::POSTWORLD;
 
-	/**
-	 * @var Permission[]
-	 */
+	/** @var Permission[] */
 	private $permissions = [];
 
 	/**
diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php
index 30bb3782d..99ef54a81 100644
--- a/src/pocketmine/plugin/PluginManager.php
+++ b/src/pocketmine/plugin/PluginManager.php
@@ -76,19 +76,13 @@ class PluginManager{
 	/** @var SimpleCommandMap */
 	private $commandMap;
 
-	/**
-	 * @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/pocketmine/scheduler/TaskScheduler.php b/src/pocketmine/scheduler/TaskScheduler.php
index efafd5ace..60e4b1b60 100644
--- a/src/pocketmine/scheduler/TaskScheduler.php
+++ b/src/pocketmine/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/pocketmine/utils/Random.php b/src/pocketmine/utils/Random.php
index 309d40897..b5680a69b 100644
--- a/src/pocketmine/utils/Random.php
+++ b/src/pocketmine/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 */