diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 03de472325..7710ed1799 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -1734,7 +1734,7 @@ const char* DmaMgr_GetFileNameImpl(u32 vrom) {
         iter++;
         name++;
     }
-    //! @bug Since the devs forgot to return in case the file isn't found, the return value will be a pointer to the end
+    //! @bug Since there is no return, in case the file isn't found, the return value will be a pointer to the end
     // of gDmaDataTable
 }
 
diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c
index 73ae713216..db13e91e6d 100644
--- a/src/code/debug_malloc.c
+++ b/src/code/debug_malloc.c
@@ -83,7 +83,7 @@ void* DebugArena_Calloc(u32 num, u32 size) {
 }
 
 void DebugArena_Display(void) {
-    // "Zelda heap display" (devs forgot to change "Zelda" to "Debug" apparently)
+    // "Zelda heap display" ("Zelda" should probably have been changed to "Debug")
     osSyncPrintf("ゼルダヒープ表示\n");
     __osDisplayArena(&sDebugArena);
 }
diff --git a/src/code/graph.c b/src/code/graph.c
index d74ff04856..5b04358645 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -322,7 +322,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
         GfxPool* pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1];
 
         if (pool->headMagic != GFXPOOL_HEAD_MAGIC) {
-            //! @bug (?) : devs might've forgotten "problem = true;"
+            //! @bug (?) : "problem = true;" may be missing
             osSyncPrintf("%c", 7);
             // Dynamic area head is destroyed
             osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST);
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index 1e74f49fd9..dc1ba816d9 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -76,7 +76,7 @@ void KaleidoManager_Destroy() {
     sKaleidoAreaPtr = NULL;
 }
 
-// NOTE: this function looks messed up and probably doesn't work like how the devs wanted it to work
+// NOTE: this function looks messed up and probably doesn't work how it was intended to
 void* KaleidoManager_GetRamAddr(void* vram) {
     KaleidoMgrOverlay* iter = gKaleidoMgrCurOvl;
     KaleidoMgrOverlay* ovl = iter;
@@ -90,7 +90,7 @@ void* KaleidoManager_GetRamAddr(void* vram) {
                 ovl = iter;
                 goto KaleidoManager_GetRamAddr_end;
             }
-            //! @bug Devs probably forgot iter++ here
+            //! @bug Probably missing iter++ here
         }
 
         osSyncPrintf("異常\n"); // "Abnormal"
diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c
index 1b34c09440..9de42d9663 100644
--- a/src/code/z_vismono.c
+++ b/src/code/z_vismono.c
@@ -1,7 +1,7 @@
 #include "global.h"
 
 // (Note: 80 = SCREEN_HEIGHT/3, see VisMono_DrawTexture)
-// Did the devs forget to update this? 1+1+1+80*(7+2+2+3)+1+1 makes more sense
+// This may not have been kept up-to-date with the code, 1+1+1+80*(7+2+2+3)+1+1 makes more sense
 #define DLSIZE (1 + 3 + 1 + 1 + 80 * (7 + 2 + 2 + 3) + 1)
 
 // framebuffer
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
index ab9ae3f159..4f8525057a 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
@@ -465,7 +465,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, GlobalContext* globalCtx) {
     } else if (this->actor.parent != NULL) {
         this->actor.parent->world.pos = this->mouthPos;
         ((EnBombf*)this->actor.parent)->timer++;
-        //! @bug The devs forgot an explosive could also be a bombchu, which leads to a serious bug. ->timer (0x1F8) is
+        //! @bug An explosive can also be a bombchu, not always a bomb, which leads to a serious bug. ->timer (0x1F8) is
         //! outside the bounds of the bombchu actor, and the memory it writes to happens to be one of the pointers in
         //! the next arena node. When this value is written to, massive memory corruption occurs.
     }