diff --git a/src/KingSystem/Map/mapPlacementMap.cpp b/src/KingSystem/Map/mapPlacementMap.cpp
index 6b4cdfb2..e9bf6765 100644
--- a/src/KingSystem/Map/mapPlacementMap.cpp
+++ b/src/KingSystem/Map/mapPlacementMap.cpp
@@ -25,9 +25,9 @@ PlacementMap::PlacementMap() {
     mCol = 0;
     mRow = 0;
     mNumRoutes = 0;
-    mP18 = 0;
-    mMgr = 0;
-    mPa = 0;
+    mP18 = nullptr;
+    mMgr = nullptr;
+    mPa = nullptr;
     mDynamicGroupIdx = 0xFFFFFFFF;
     mRes[0].mStatus = HkscRes::Status::_0;
     mRes[1].mStatus = HkscRes::Status::_0;
diff --git a/src/KingSystem/Quest/qstActorData.cpp b/src/KingSystem/Quest/qstActorData.cpp
index c5f0d041..56314813 100644
--- a/src/KingSystem/Quest/qstActorData.cpp
+++ b/src/KingSystem/Quest/qstActorData.cpp
@@ -5,9 +5,7 @@ namespace ksys::qst {
 
 CameraTarget::~CameraTarget() = default;
 
-ActorData::ActorData(sead::Heap* heap) {
-    this->heap = heap;
-}
+ActorData::ActorData(sead::Heap* heap) : heap(heap) {}
 
 ActorData::~ActorData() {
     for (int i = 0; i < targets.size(); ++i) {
diff --git a/src/KingSystem/Quest/qstIndicator.cpp b/src/KingSystem/Quest/qstIndicator.cpp
index eff0585b..2c9af0bb 100644
--- a/src/KingSystem/Quest/qstIndicator.cpp
+++ b/src/KingSystem/Quest/qstIndicator.cpp
@@ -3,10 +3,7 @@
 
 namespace ksys::qst {
 
-Indicator::Indicator(Step* step, sead::Heap* heap) {
-    this->heap = heap;
-    this->step = step;
-}
+Indicator::Indicator(Step* step, sead::Heap* heap) : heap(heap), step(step) {}
 
 Indicator::~Indicator() {
     finalize();
diff --git a/src/KingSystem/Utils/Byaml/Byaml.cpp b/src/KingSystem/Utils/Byaml/Byaml.cpp
index 2fe0dac1..d6a8498d 100644
--- a/src/KingSystem/Utils/Byaml/Byaml.cpp
+++ b/src/KingSystem/Utils/Byaml/Byaml.cpp
@@ -145,7 +145,7 @@ bool ByamlIter::getByamlDataByKey(ByamlData* data, const char* key) const {
 
     auto* header = reinterpret_cast<const al::ByamlHeader*>(mData);
     const s32 offset = header->getHashKeyTableOffset();
-    if (!offset) {
+    if (offset == 0) {
         return false;
     }
     const ByamlStringTableIter table = ByamlStringTableIter(&mData[offset]);
diff --git a/src/KingSystem/Utils/Thread/Event.cpp b/src/KingSystem/Utils/Thread/Event.cpp
index 611705b4..1c16be54 100644
--- a/src/KingSystem/Utils/Thread/Event.cpp
+++ b/src/KingSystem/Utils/Thread/Event.cpp
@@ -23,12 +23,12 @@ void Event::initialize(bool manual_reset) {
 }
 
 void Event::wait() {
-    if (!mSignalSet || !mManualReset)
+    if (mSignalSet == 0 || !mManualReset)
         mEvent.wait();
 }
 
 bool Event::wait(sead::TickSpan duration) {
-    return (mSignalSet && mManualReset) || mEvent.wait(duration);
+    return (mSignalSet != 0 && mManualReset) || mEvent.wait(duration);
 }
 
 void Event::setSignal() {
@@ -40,7 +40,7 @@ void Event::setSignal() {
 }
 
 void Event::resetSignal() {
-    if (!mSignalSet && mManualReset)
+    if (mSignalSet == 0 && mManualReset)
         return;
 
     mEvent.resetSignal();