diff --git a/include/d/a/d_a_salbage.h b/include/d/a/d_a_salbage_if.h
similarity index 91%
rename from include/d/a/d_a_salbage.h
rename to include/d/a/d_a_salbage_if.h
index cca447c1..a580424f 100644
--- a/include/d/a/d_a_salbage.h
+++ b/include/d/a/d_a_salbage_if.h
@@ -1,5 +1,5 @@
-#ifndef D_A_SALBAGE_H
-#define D_A_SALBAGE_H
+#ifndef D_A_SALBAGE_IF_H
+#define D_A_SALBAGE_IF_H
 
 #include "common.h"
 
diff --git a/include/d/a/d_a_salbage_obj.h b/include/d/a/d_a_salbage_obj.h
index 3afa45ca..742224bd 100644
--- a/include/d/a/d_a_salbage_obj.h
+++ b/include/d/a/d_a_salbage_obj.h
@@ -2,11 +2,11 @@
 #define D_A_SALBAGE_OBJ_H
 
 #include "common.h"
+#include "d/a/d_a_salbage_if.h"
 #include "d/a/obj/d_a_obj_base.h"
 #include "d/col/bg/d_bg_s_acch.h"
 #include "d/col/cc/d_cc_d.h"
 #include "d/d_shadow.h"
-#include "d/a/d_a_salbage.h"
 #include "m/m3d/m_smdl.h"
 #include "m/m_mtx.h"
 #include "m/m_quat.h"
diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h
index 30418a75..ad20ccc9 100644
--- a/include/d/a/obj/d_a_obj_base.h
+++ b/include/d/a/obj/d_a_obj_base.h
@@ -4,7 +4,7 @@
 #include "c/c_math.h"
 #include "common.h"
 #include "d/a/d_a_base.h"
-#include "d/a/d_a_salbage.h"
+#include "d/a/d_a_salbage_if.h"
 #include "d/col/c/c_cc_d.h"
 #include "d/col/c/c_m3d_g_aab.h"
 #include "d/d_jnt_col.h"
diff --git a/src/d/a/d_a_salbage_obj.cpp b/src/d/a/d_a_salbage_obj.cpp
index 2251e9b7..2e1f094b 100644
--- a/src/d/a/d_a_salbage_obj.cpp
+++ b/src/d/a/d_a_salbage_obj.cpp
@@ -64,8 +64,8 @@ int dAcSalbageObj_c::actorExecute() {
 }
 
 int dAcSalbageObj_c::preExecute() {
-    // TODO - this matches, but so does `bool` conversion...
-    int result = dAcObjBase_c::preExecute() == NOT_READY ? NOT_READY : SUCCEEDED;
+    // @bug bool conversion
+    bool result = dAcObjBase_c::preExecute();
     if (dSalvageMgr_c::sInstance->checkDeliveredStoryflag(mSalvageIf.getSalvageObjId())) {
         s32 id = mSalvageIf.getSalvageObjId();
         if (id != SALVAGE_OBJ_DIVINER_CRYSTAL && id != SALVAGE_OBJ_POT) {
@@ -107,8 +107,10 @@ int dAcSalbageObj_c::preExecute() {
 int dAcSalbageObj_c::preDraw() {
     if (dAcObjBase_c::preDraw() == NOT_READY) {
         return NOT_READY;
+    } else if (mSalvageIf.isHidden()) {
+        return NOT_READY;
     } else {
-        return mSalvageIf.isHidden() ? NOT_READY : SUCCEEDED;
+        return SUCCEEDED;
     }
 }
 
@@ -211,9 +213,7 @@ void dAcSalbageObj_c::addAttentionTargetIfNeeded() {
 }
 
 void dAcSalbageObj_c::addAttentionTarget() {
-    AttentionManager::sInstance->addTarget(
-        *this, sInteractionTargetDefs[mSalvageIf.getSalvageObjId()], 0, nullptr
-    );
+    AttentionManager::sInstance->addTarget(*this, sInteractionTargetDefs[mSalvageIf.getSalvageObjId()], 0, nullptr);
 
     InteractionTargetDef copy = sInteractionTargetDefs[mSalvageIf.getSalvageObjId()];
     copy.field_0x00 = 1;