diff --git a/Core/ram.asm b/Core/ram.asm
index 8292a63..2bf105a 100644
--- a/Core/ram.asm
+++ b/Core/ram.asm
@@ -8087,7 +8087,7 @@ ABILITY         = $7EF379
 ;   i - Ice Palace
 ;   m - Misery Mire
 ;   t - Turtle Rock
-CRYSTALS        = $7EF37A
+Crystals        = $7EF37A
 
 ; 0x00 - Normal magic
 ; 0x01 - Half magic
diff --git a/Dungeons/floor_puzzle.asm b/Dungeons/floor_puzzle.asm
index ef9bb37..33000cc 100644
--- a/Dungeons/floor_puzzle.asm
+++ b/Dungeons/floor_puzzle.asm
@@ -1,8 +1,6 @@
 
-;================================================
-;use holes_0 tag routine
-; DO NOT USE holes_1 tag (broken because of holes_0 tag)
-;==================================================
+; ================================================
+; use holes_0 tag routine
 
 org $01CC00 ; holes_0 tag routine
 JSL NewTagRoutine
@@ -17,10 +15,10 @@ NewTagRoutine:
   LDA.b $20 : CLC : ADC #$10 : AND.b #$F0 : STA.w $0224 ; y
   LDA.b $22 : CLC : ADC #$08 : AND.b #$F0 : STA.w $0225 ; x
 
-  LDA.w $0224 : CMP.w $0226 : BNE .differentTile
-    LDA.w $0225 : CMP.w $0227 : BNE .differentTile
-      JMP .sameTile
-  .differentTile
+  LDA.w $0224 : CMP.w $0226 : BNE .different_tile
+    LDA.w $0225 : CMP.w $0227 : BNE .different_tile
+      JMP .same_tile
+  .different_tile
 
   ; do code here for tile code
   REP #$30
@@ -32,7 +30,7 @@ NewTagRoutine:
   LDA.l $7E2000, X : CMP.w #$0DED : BNE +
     JSR update_star_tile
     JSR SearchForEmptyStar
-    BRA .doneupdate
+    BRA .done_update
   +
   LDA.l $7E2000, X : CMP.w #$0DEE : BNE +
     ;JSR SearchToRedStar
@@ -43,10 +41,10 @@ NewTagRoutine:
     ;JSR SearchForEmptyStar
   +
 
-  .doneupdate
+  .done_update
   SEP #$30
 
-  .sameTile
+  .same_tile
 
   LDA.w $0224 : STA.w $0226 ; Last Y
   LDA.w $0225 : STA.w $0227 ; Last X
@@ -93,26 +91,19 @@ update_red_star_tile:
 replace_red_tile_star:
 {
   LDX.w $1000
-
-  LDA.w #$19EE : STA.w $1006,X
-  LDA.w #$99EE : STA.w $100C,X
-  LDA.w #$59EE : STA.w $1012,X
-  LDA.w #$D9EE : STA.w $1018,X
+  LDA.w #$19EE : STA.w $1006, X
+  LDA.w #$99EE : STA.w $100C, X
+  LDA.w #$59EE : STA.w $1012, X
+  LDA.w #$D9EE : STA.w $1018, X
 
   LDX.b $06
-
   LDA.w #$19EE : STA.l $7E2000, X
   LDA.w #$99EE : STA.l $7E2080, X
   LDA.w #$59EE : STA.l $7E2002, X
   LDA.w #$D9EE : STA.l $7E2082, X
-
-  AND.w #$03FF
-  TAX
-
-  LDA.l $7EFE00,X
-  AND.w #$00FF
-  STA.b $08
-  STA.b $09
+  AND.w #$03FF : TAX
+  LDA.l $7EFE00,X : AND.w #$00FF
+  STA.b $08 : STA.b $09
 
   JMP replace_tile_continue
 }
diff --git a/Items/book_of_secrets.asm b/Items/book_of_secrets.asm
index 327096c..71d0220 100644
--- a/Items/book_of_secrets.asm
+++ b/Items/book_of_secrets.asm
@@ -19,8 +19,6 @@
 org $068365
 JSL LinkItem_SecretsBook ; overwrite it (originally JSL $099F91)
 
-; =========================================================
-
 pullpc
 
 LinkItem_SecretsBook:
diff --git a/Menu/menu_hud.asm b/Menu/menu_hud.asm
index f3afd44..2637b0b 100644
--- a/Menu/menu_hud.asm
+++ b/Menu/menu_hud.asm
@@ -538,8 +538,6 @@ FloorIndicatorNumberHigh:
   dw $E51C, $250E, $007F
 }
 
-; ==========================================================
-
 ; $57CF6 DATA
 org $0AFCF6
 FloorIndicatorNumberLow:
@@ -548,8 +546,6 @@ FloorIndicatorNumberLow:
   dw $E50C, $A50E, $007F
 }
 
-; ==========================================================
-
 ; *$57D0C-$57DA7 JUMP LOCATION (LONG)
 org $0AFD0C
 FloorIndicator:
diff --git a/Overworld/overlays.asm b/Overworld/overlays.asm
index 3a0fa35..c545e39 100644
--- a/Overworld/overlays.asm
+++ b/Overworld/overlays.asm
@@ -1,12 +1,4 @@
 ; =========================================================
-; Normal Overlays:
-; Overworld_DrawQuadrantsAndOverlays
-; -> ApplyOverworldOverlay
-
-; Animated Entrances:
-; Module09_00_PlayerControl
-; -> Overworld_AnimateEntrance
-; =========================================================
 
 ; Trigger Zora Temple from Tablet
 org $1EE061
diff --git a/Sprites/Bosses/kydreeok_head.asm b/Sprites/Bosses/kydreeok_head.asm
index f5dc495..e15e672 100644
--- a/Sprites/Bosses/kydreeok_head.asm
+++ b/Sprites/Bosses/kydreeok_head.asm
@@ -47,8 +47,6 @@ Sprite_KydreeokHead_Long:
   RTL
 }
 
-; =========================================================
-
 Sprite_KydreeokHead_Prep:
 {
   PHB : PHK : PLB
@@ -59,8 +57,6 @@ Sprite_KydreeokHead_Prep:
   RTL
 }
 
-; =========================================================
-
 SpeedTable:
   db $00, $02, $04, $06, $07, $01, $06, $03
   db 0, -2, -4, -6, -7, -1, -6, -3
@@ -219,8 +215,6 @@ KydreeokHead_RotationMove:
   RTS
 }
 
-; =========================================================
-
 CoordinateBasedRotation:
 {
   LDA.w Neck_Index : TAY
@@ -238,20 +232,18 @@ CoordinateBasedRotation:
     LDA #0 : STA.w Neck_Index
   .not_full
   RTS
+
+  ; Table for X coordinates (based on a radius of 8)
+  X_Coords:
+    db 8, 11,  8,  3, -4, -9, -12, -9
+    db -4,  3,  8, 11,  8,  3, -4, -9
+
+  ; Table for Y coordinates (based on a radius of 8)
+  Y_Coords:
+    db 0, -3, -8, -11, -15, -15, -11, -8
+    db -3,  0,  3,  8, 11, 15, 15, 11
 }
 
-; Table for X coordinates (based on a radius of 8)
-X_Coords:
-  db 8, 11,  8,  3, -4, -9, -12, -9
-  db -4,  3,  8, 11,  8,  3, -4, -9
-
-; Table for Y coordinates (based on a radius of 8)
-Y_Coords:
-  db 0, -3, -8, -11, -15, -15, -11, -8
-  db -3,  0,  3,  8, 11, 15, 15, 11
-
-; =========================================================
-
 RotateHeadUsingSpeedValues:
 {
   LDY.w Neck_Index
@@ -284,8 +276,6 @@ RotateHeadUsingSpeedValues:
   db -12,  -9,  -6,  -3
 }
 
-; =========================================================
-
 RandomlyAttack:
 {
   JSL Sprite_DamageFlash_Long