diff --git a/lib/al/Library/HitSensor/SensorMsgSetupUtil.h b/lib/al/Library/HitSensor/SensorMsgSetupUtil.h
index b245b33d..54fabd38 100644
--- a/lib/al/Library/HitSensor/SensorMsgSetupUtil.h
+++ b/lib/al/Library/HitSensor/SensorMsgSetupUtil.h
@@ -45,9 +45,7 @@ Creating a SensorMsg class called SensorMsgTest2 that holds a string referenced
     class SensorMsg##Type : public al::SensorMsg {                                                 \
         SEAD_RTTI_OVERRIDE(SensorMsg##Type, al::SensorMsg)                                         \
     public:                                                                                        \
-        inline SensorMsg##Type(PARAM_LIST(__VA_ARGS__)) {                                          \
-            SET_MEMBER_PARAM_MULTI(__VA_ARGS__);                                                   \
-        }                                                                                          \
+        inline SensorMsg##Type(PARAM_LIST(__VA_ARGS__)) { SET_MEMBER_PARAM_MULTI(__VA_ARGS__); }   \
                                                                                                    \
         DECL_GET_MULTI(__VA_ARGS__)                                                                \
                                                                                                    \
diff --git a/lib/al/Library/Nerve/NerveSetupUtil.h b/lib/al/Library/Nerve/NerveSetupUtil.h
index 20947d4d..df1f2b37 100644
--- a/lib/al/Library/Nerve/NerveSetupUtil.h
+++ b/lib/al/Library/Nerve/NerveSetupUtil.h
@@ -91,9 +91,7 @@ al::initNerveAction(this, "Hide", &NrvExampleUseCase.collector, 0);
             (keeper->getParent<Class>())->exe##ActionFunc();                                       \
         }                                                                                          \
                                                                                                    \
-        const char* getActionName() const override {                                               \
-            return #Action;                                                                        \
-        }                                                                                          \
+        const char* getActionName() const override { return #Action; }                             \
     };
 
 #define NERVE_ACTION_IMPL(Class, Action) NERVE_ACTION_IMPL_(Class, Action, Action)
@@ -108,7 +106,5 @@ al::initNerveAction(this, "Hide", &NrvExampleUseCase.collector, 0);
                                                                                                    \
         alNerveFunction::NerveActionCollector collector;                                           \
                                                                                                    \
-        NrvStruct##Class() {                                                                       \
-            FOR_EACH(NERVE_ACTION_CONSTRUCT, Class, __VA_ARGS__)                                   \
-        }                                                                                          \
+        NrvStruct##Class() { FOR_EACH(NERVE_ACTION_CONSTRUCT, Class, __VA_ARGS__) }                \
     } Nrv##Class;
diff --git a/lib/al/Library/Yaml/ParameterBase.h b/lib/al/Library/Yaml/ParameterBase.h
index 94d117e9..924956e5 100644
--- a/lib/al/Library/Yaml/ParameterBase.h
+++ b/lib/al/Library/Yaml/ParameterBase.h
@@ -50,9 +50,7 @@ SEAD_ENUM(YamlParamType,
             return YamlParamType::text(YamlParamType::Name);                                       \
         }                                                                                          \
                                                                                                    \
-        YamlParamType getParamType() const override {                                              \
-            return YamlParamType::Name;                                                            \
-        }                                                                                          \
+        YamlParamType getParamType() const override { return YamlParamType::Name; }                \
     };
 
 class ParameterBase {
diff --git a/src/Boss/Stacker/StackerStatePanic.cpp b/src/Boss/Stacker/StackerStatePanic.cpp
index 37872a3c..43a9d922 100644
--- a/src/Boss/Stacker/StackerStatePanic.cpp
+++ b/src/Boss/Stacker/StackerStatePanic.cpp
@@ -77,7 +77,6 @@ bool StackerStatePanic::receiveMsg(const al::SensorMsg* self, al::HitSensor* oth
     if (al::isNerve(this, &NrvStackerStatePanic.Wait) ||
         al::isNerve(this, &NrvStackerStatePanic.Surprise) ||
         al::isNerve(this, &NrvStackerStatePanic.CapHit)) {
-
         if (rs::isMsgCapReflect(self) || rs::isMsgStackerCapBoostAttack(self)) {
             _30 = 10;
             al::faceToTarget(mActor, rs::getPlayerPos(mActor));
@@ -87,17 +86,15 @@ bool StackerStatePanic::receiveMsg(const al::SensorMsg* self, al::HitSensor* oth
             al::setNerve(this, &NrvStackerStatePanic.CapHit);
             return true;
         }
-        } else {
-            if (rs::isMsgCapAttack(self) || rs::isMsgStackerCapBoostAttack(self)) {
-                _30 = 10;
-                al::faceToTarget(mActor, rs::getPlayerPos(mActor));
-                al::startHitReaction(mActor, "逃げ中帽子ヒット");
-                rs::requestHitReactionToAttacker(self, hitSensor, other);
-                al::startAction(mActor, "PanicStart");
-                al::setNerve(this, &NrvStackerStatePanic.CapHit);
-                return true;
-            }
-        }
+    } else if (rs::isMsgCapAttack(self) || rs::isMsgStackerCapBoostAttack(self)) {
+        _30 = 10;
+        al::faceToTarget(mActor, rs::getPlayerPos(mActor));
+        al::startHitReaction(mActor, "逃げ中帽子ヒット");
+        rs::requestHitReactionToAttacker(self, hitSensor, other);
+        al::startAction(mActor, "PanicStart");
+        al::setNerve(this, &NrvStackerStatePanic.CapHit);
+        return true;
+    }
     return false;
 }