diff --git a/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java b/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
index 04e1f6248813e0db03e753b663a9dc85cbc94ad0..137eb91da836c95d32c78473f72348e4067042a4 100644
--- a/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
+++ b/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
@@ -37,7 +37,7 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
     }
 
     @Override
-    public CommandExecutor updateInfo(MessageManager messageManager) {
+    public CommandExecutor<CommandFire> updateInfo(MessageManager messageManager) {
         super.updateInfo(messageManager);
 
         // FireStationから受信したMessageCivilianを収集
@@ -69,13 +69,13 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
     }
 
     @Override
-    public CommandExecutor setCommand(CommandFire command) {
+    public CommandExecutor<CommandFire> setCommand(CommandFire command) {
         // TODO
         return this;
     }
 
     @Override
-    public CommandExecutor calc() {
+    public CommandExecutor<CommandFire> calc() {
         // TODO
         return this;
     }
@@ -88,10 +88,9 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
     private boolean isValidHuman(StandardEntity entity) {
         if (entity == null)
             return false;
-        if (!(entity instanceof Human))
+        if (!(entity instanceof Human target))
             return false;
 
-        Human target = (Human) entity;
         if (!target.isHPDefined() || target.getHP() == 0)
             return false;
         if (!target.isPositionDefined())
@@ -106,10 +105,7 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
             return false;
 
         StandardEntityURN positionURN = position.getStandardURN();
-        if (positionURN == REFUGE || positionURN == AMBULANCE_TEAM)
-            return false;
-
-        return true;
+        return positionURN != REFUGE && positionURN != AMBULANCE_TEAM;
     }
 
     /**
@@ -133,9 +129,6 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
             return false;
 
         final Human targetHuman = (Human) targetEntity;
-        if (targetHuman.getBuriedness() <= 0)
-            return false;
-
-        return true;
+        return targetHuman.getBuriedness() > 0;
     }
 }