diff --git a/src/BlockHorizons/PerWorldPlayer/player/PlayerInstance.php b/src/BlockHorizons/PerWorldPlayer/player/PlayerInstance.php
index 9cf496a..b7a9dc4 100644
--- a/src/BlockHorizons/PerWorldPlayer/player/PlayerInstance.php
+++ b/src/BlockHorizons/PerWorldPlayer/player/PlayerInstance.php
@@ -34,18 +34,10 @@ final class PlayerInstance{
 	/** @var PlayerWorldData[] */
 	private array $world_data = [];
 
-	/**
-	 * @var Closure[][]
-	 *
-	 * @phpstan-var array<string, array<int, Closure(PlayerWorldData) : void>>
-	 */
+	/** @var array<string, array<int, Closure(PlayerWorldData) : void>> */
 	private array $world_data_callbacks = [];
 
-	/**
-	 * @var Closure[]
-	 *
-	 * @phpstan-var array<Closure() : void>
-	 */
+	/** @var array<Closure() : void> */
 	private array $on_locks_release = [];
 
 	public function __construct(Loader $loader, Player $player){
@@ -79,9 +71,7 @@ public function isLocked() : bool{
 	}
 
 	/**
-	 * @param Closure $callback
-	 *
-	 * @phpstan-param Closure() : void $callback
+	 * @param Closure() : void $callback
 	 */
 	public function waitForUnlock(Closure $callback) : void{
 		if($this->isLocked()){
@@ -94,9 +84,7 @@ public function waitForUnlock(Closure $callback) : void{
 
 	/**
 	 * @param WorldInstance $world
-	 * @param Closure $callback
-	 *
-	 * @phpstan-param Closure(PlayerWorldData) : void $callback
+	 * @param Closure(PlayerWorldData) : void $callback
 	 */
 	public function loadWorldData(WorldInstance $world, Closure $callback) : void{
 		if(isset($this->world_data[$name = $world->getName()])){
diff --git a/src/BlockHorizons/PerWorldPlayer/world/bundle/BundleManager.php b/src/BlockHorizons/PerWorldPlayer/world/bundle/BundleManager.php
index 65194ed..b49214a 100644
--- a/src/BlockHorizons/PerWorldPlayer/world/bundle/BundleManager.php
+++ b/src/BlockHorizons/PerWorldPlayer/world/bundle/BundleManager.php
@@ -15,9 +15,7 @@ final class BundleManager{
 	private array $bundled_worlds = [];
 
 	/**
-	 * @param mixed[] $bundled_worlds_configuration
-	 *
-	 * @phpstan-param array<string, array<string>> $bundled_worlds_configuration
+	 * @param array<string, array<string>> $bundled_worlds_configuration
 	 */
 	public function __construct(array $bundled_worlds_configuration){
 		/**
diff --git a/src/BlockHorizons/PerWorldPlayer/world/data/PlayerWorldData.php b/src/BlockHorizons/PerWorldPlayer/world/data/PlayerWorldData.php
index 884d04a..ab6383f 100644
--- a/src/BlockHorizons/PerWorldPlayer/world/data/PlayerWorldData.php
+++ b/src/BlockHorizons/PerWorldPlayer/world/data/PlayerWorldData.php
@@ -17,14 +17,10 @@ public static function empty() : PlayerWorldData{
 	}
 
 	/**
-	 * @param Item[] $armor
-	 * @param Item[] $inventory
-	 * @param Item[] $ender
+	 * @param array<int, Item> $armor
+	 * @param array<int, Item> $inventory
+	 * @param array<int, Item> $ender
 	 * @return self
-	 *
-	 * @phpstan-param array<int, Item> $armor
-	 * @phpstan-param array<int, Item> $inventory
-	 * @phpstan-param array<int, Item> $ender
 	 */
 	public static function emptyWithInventory(array $armor, array $inventory, array $ender) : PlayerWorldData{
 		return new self($armor, $inventory, $ender, 20.0, [], Server::getInstance()->getGamemode(), 0, 20.0, 0.0, 5.0);
@@ -59,9 +55,9 @@ public static function fromPlayer(Player $player) : PlayerWorldData{
 	}
 
 	/**
-	 * @param Item[] $armor_inventory
-	 * @param Item[] $inventory
-	 * @param Item[] $ender_inventory
+	 * @param array<int, Item> $armor_inventory
+	 * @param array<int, Item> $inventory
+	 * @param array<int, Item> $ender_inventory
 	 * @param float $health
 	 * @param EffectInstance[] $effects
 	 * @param GameMode $gamemode
@@ -69,10 +65,6 @@ public static function fromPlayer(Player $player) : PlayerWorldData{
 	 * @param float $food
 	 * @param float $exhaustion
 	 * @param float $saturation
-	 *
-	 * @phpstan-param array<int, Item> $armor_inventory
-	 * @phpstan-param array<int, Item> $inventory
-	 * @phpstan-param array<int, Item> $ender_inventory
 	 */
 	public function __construct(
 		public array $armor_inventory,
diff --git a/src/BlockHorizons/PerWorldPlayer/world/data/SaveDataManager.php b/src/BlockHorizons/PerWorldPlayer/world/data/SaveDataManager.php
index d86113b..94298e0 100644
--- a/src/BlockHorizons/PerWorldPlayer/world/data/SaveDataManager.php
+++ b/src/BlockHorizons/PerWorldPlayer/world/data/SaveDataManager.php
@@ -11,11 +11,7 @@
 
 final class SaveDataManager{
 
-	/**
-	 * @var Closure[]
-	 *
-	 * @phpstan-var array<string, Closure(PlayerWorldData $data, Player $player) : void>
-	 */
+	/** @var array<string, Closure(PlayerWorldData $data, Player $player) : void> */
 	private array $injectors = [];
 
 	public function __construct(Loader $loader){
@@ -52,9 +48,7 @@ public function __construct(Loader $loader){
 
 	/**
 	 * @param string $identifier
-	 * @param Closure $injector
-	 *
-	 * @phpstan-param Closure(PlayerWorldData $data, Player $player) : void $injector
+	 * @param Closure(PlayerWorldData $data, Player $player) : void $injector
 	 */
 	private function registerInjector(string $identifier, Closure $injector) : void{
 		$this->injectors[$identifier] = $injector;
diff --git a/src/BlockHorizons/PerWorldPlayer/world/database/WorldDatabase.php b/src/BlockHorizons/PerWorldPlayer/world/database/WorldDatabase.php
index b96e5dd..e6bd900 100644
--- a/src/BlockHorizons/PerWorldPlayer/world/database/WorldDatabase.php
+++ b/src/BlockHorizons/PerWorldPlayer/world/database/WorldDatabase.php
@@ -16,8 +16,7 @@ interface WorldDatabase{
 	 *
 	 * @param WorldInstance $world
 	 * @param Player $player
-	 * @param Closure $onLoad
-	 * @phpstan-param Closure(PlayerWorldData $data) : void $onLoad
+	 * @param Closure(PlayerWorldData $data) : void $onLoad
 	 */
 	public function load(WorldInstance $world, Player $player, Closure $onLoad) : void;
 
@@ -28,8 +27,7 @@ public function load(WorldInstance $world, Player $player, Closure $onLoad) : vo
 	 * @param Player $player
 	 * @param PlayerWorldData $data
 	 * @param int $cause what triggered the save.
-	 * @param Closure $onSave
-	 * @phpstan-param Closure(bool $success) : void $onSave
+	 * @param Closure(bool $success) : void $onSave
 	 */
 	public function save(WorldInstance $world, Player $player, PlayerWorldData $data, int $cause, Closure $onSave) : void;