diff --git a/Sprites/Bosses/arrghus.asm b/Sprites/Bosses/arrghus.asm
index bdd4aba..095a4dc 100644
--- a/Sprites/Bosses/arrghus.asm
+++ b/Sprites/Bosses/arrghus.asm
@@ -1,19 +1,16 @@
 pushpc
 
-org $1E7F21 
+org $1E7F21
 Sprite3_Move:
 
 ; *$F3593-$F35C7 JUMP LOCATION
 org $1EB593
 Arrghus_ApproachTargetSpeed:
 {
-    LDA.w SprTimerA, X : BNE .delay
-    
+  LDA.w SprTimerA, X : BNE .delay
     INC $0D80, X
-    
     JSL AdvancedArrghus : NOP
-
-.delay
+  .delay
 }
 
 pullpc
@@ -21,7 +18,7 @@ AdvancedArrghus:
 {
   LDA.w SprDefl, Y : ORA.b #$08 : STA.w SprDefl, Y
   LDA.b #$04 : STA.w SprBump, Y
-  
+
   JSL Sprite_SpawnFireball
   LDA.b #$50 : STA.w SprTimerA, X
   RTL
diff --git a/Sprites/Bosses/dark_link.asm b/Sprites/Bosses/dark_link.asm
index ab6fd51..2304265 100644
--- a/Sprites/Bosses/dark_link.asm
+++ b/Sprites/Bosses/dark_link.asm
@@ -10,7 +10,7 @@
 !DeathAnimation     = 00  ; 00 = normal death, 01 = no death animation
 !ImperviousAll      = 00  ; 00 = Can be attack, 01 = attack will clink on it
 !SmallShadow        = 00  ; 01 = small shadow, 00 = no shadow
-!Shadow             = 00  ; 00 = don't draw shadow, 01 = draw a shadow 
+!Shadow             = 00  ; 00 = don't draw shadow, 01 = draw a shadow
 !Palette            = 0   ; Unused in this template (can be 0 to 7)
 !Hitbox             = 0   ; 00 to 31, can be viewed in sprite draw tool
 !Persist            = 00  ; 01 = your sprite continue to live offscreen
@@ -33,12 +33,12 @@
 ; =========================================================
 
 Sprite_DarkLink_Long:
-{  
+{
   PHB : PHK : PLB
 
   ; ADD GANON CODE if subtype == 05
   LDA.w SprSubtype, X : CMP #$05 : BNE .NotGanon
-    ; JSR Sprite_Ganon_Draw 
+    ; JSR Sprite_Ganon_Draw
     JSL Sprite_CheckActive   ; Check if game is not paused (Prevent timers from running if game is paused)
     BCC .SpriteIsNotActive2   ; Skip Main code is sprite is innactive
     JSR Sprite_Ganon_Main ; do ganon instead
@@ -55,14 +55,14 @@ Sprite_DarkLink_Long:
   .normal_draw
   CMP.b #$09 : BEQ .sword_draw
   LDA.w SprSubtype, X : BNE .skipnormal_draw
-    JSR Sprite_DarkLink_Draw 
+    JSR Sprite_DarkLink_Draw
   .skipnormal_draw
 
   LDA.w SprAction, X : CMP.b #11 : BCS .notdying
     LDA.w SprHealth, X : CMP.b #$20 : BCS .notdying
       LDA.w SprMiscC, X : BNE +
         ; check if action is 00 otherwise wait
-        LDA.w SprAction, X : BNE .notdying 
+        LDA.w SprAction, X : BNE .notdying
           %GotoAction(15) ; enraging instead
           BRA .SpriteIsNotActive
       +
@@ -111,7 +111,7 @@ Sprite_DarkLink_Prep:
   LDA #$58 : STA.w SprY, X
 
   LDA #$00 : STA.w SprMiscE, X
-  LDA #$00 : STA.w SprMiscC, X ; Enraging 
+  LDA #$00 : STA.w SprMiscC, X ; Enraging
   LDA #$C0 : STA.w SprHealth, X
   %GotoAction(4)
 
@@ -145,7 +145,7 @@ Sprite_DarkLink_Main:
   dw Enraging
 
   Handler:
-  {  
+  {
     LDA.w SprSubtype, X : CMP #$01 : BNE +
       %SetTimerA(16)
       %GotoAction(10)
@@ -309,8 +309,8 @@ Sprite_DarkLink_Main:
     STZ.w SprYSpeed, X
     .ignorezerospeed
 
-    LDA.w SprXSpeed, X : BEQ .nodiagonal 
-    LDA.w SprYSpeed, X : BEQ .nodiagonal 
+    LDA.w SprXSpeed, X : BEQ .nodiagonal
+    LDA.w SprYSpeed, X : BEQ .nodiagonal
     BPL .diagoyspeedpositive
     LDA #$F5 : STA.w SprYSpeed, X
     BRA .dodiagox
@@ -559,19 +559,19 @@ Sprite_DarkLink_Main:
       ;restore life removed by the checkdamage
       STZ.w SprBump, X
 
-            
+
         LDA #$20 : STA $29 : STA $C7
-        
+
         STZ $24
         STZ $25
-        
+
         LDA.w SprYSpeed, X  : STA $27 : EOR #$FF : STA.w SprYSpeed, X
         LDA.w SprXSpeed, X  : STA $28 : EOR #$FF : STA.w SprXSpeed, X
         LDA.b #$08 : STA.w $0F80, X
         LDA.b #$10 : STA $47 : STA $46
         %SetTimerC(16)
       %GotoAction(09)
-        
+
       RTS
 
     .no_damage
@@ -671,8 +671,8 @@ Sprite_DarkLink_Main:
     LDA #$20
     .movespeed
     JSL Sprite_ProjectSpeedTowardsEntityLong
-    LDA.b $01 : STA.w SprXSpeed, X 
-    LDA.b $00 : STA.w SprYSpeed, X 
+    LDA.b $01 : STA.w SprXSpeed, X
+    LDA.b $00 : STA.w SprYSpeed, X
 
 
     REP #$20
@@ -694,8 +694,8 @@ Sprite_DarkLink_Main:
 
     CMP #$0008 : BCS .toofar
     SEP #$20
-    STZ.w SprXSpeed, X 
-    STZ.w SprYSpeed, X 
+    STZ.w SprXSpeed, X
+    STZ.w SprYSpeed, X
     %GotoAction(4)
     .toofar
     SEP #$20
@@ -930,7 +930,7 @@ Sprite_DarkLink_Main:
     LDA.w SprTimerB, X : BNE ++
 
     LDA.b #$08 : STA.w SprTimerB, X
-    LDA.w SprMiscD, X : INC : STA.w SprMiscD, X : CMP #$04 : BNE + 
+    LDA.w SprMiscD, X : INC : STA.w SprMiscD, X : CMP #$04 : BNE +
     STZ.w SprMiscD, X
     LDA #$00
     +
@@ -940,7 +940,7 @@ Sprite_DarkLink_Main:
     ++
 
     LDA.w SprTimerA, X : BNE +
-    LDA.b #$60 : STA.w SprTimerA, X 
+    LDA.b #$60 : STA.w SprTimerA, X
     LDA.b #$12 : STA.w SprTimerB, X
     LDA.b #44 : STA.w SprFrame, X
     %GotoAction(12)
@@ -1036,17 +1036,17 @@ Sprite_DarkLink_Draw:
   .nextTile
 
   PHX ; Save current Tile Index?
-      
+
   TXA : CLC : ADC $06 ; Add Animation Index Offset
 
   PHA ; Keep the value with animation index offset?
 
-  ASL A : TAX 
+  ASL A : TAX
 
   REP #$20
 
   LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
-  AND.w #$0100 : STA $0E 
+  AND.w #$0100 : STA $0E
   INY
   LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
   CLC : ADC #$0010 : CMP.w #$0100
@@ -1063,14 +1063,14 @@ Sprite_DarkLink_Draw:
   INY
   LDA .properties, X : STA ($90), Y
 
-  PHY 
-      
+  PHY
+
   TYA : LSR #2 : TAY
-      
+
   LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
-      
+
   PLY : INY
-      
+
   PLX : DEX : BPL .nextTile
 
   PLX
@@ -1102,17 +1102,17 @@ Sprite_DarkLink_Draw:
   .nextTile2
 
   PHX ; Save current Tile Index?
-      
+
   TXA : CLC : ADC $06 ; Add Animation Index Offset
 
   PHA ; Keep the value with animation index offset?
 
-  ASL A : TAX 
+  ASL A : TAX
 
   REP #$20
 
   LDA $00 : CLC : ADC .x_offsets2, X : STA ($90), Y
-  AND.w #$0100 : STA $0E 
+  AND.w #$0100 : STA $0E
   INY
   LDA $02 : CLC : ADC .y_offsets2, X : STA ($90), Y
   CLC : ADC #$0010 : CMP.w #$0100
@@ -1129,14 +1129,14 @@ Sprite_DarkLink_Draw:
   INY
   LDA .properties2, X : STA ($90), Y
 
-  PHY 
-      
+  PHY
+
   TYA : LSR #2 : TAY
-      
+
   LDA .sizes2, X : ORA $0F : STA ($92), Y ; store size in oam buffer
-      
+
   PLY : INY
-      
+
   PLX : DEX : BPL .nextTile2
 
   PLX
@@ -1526,11 +1526,11 @@ GanonInit:
   LDA #$05 : STA.w SprSubtype, Y
   LDA $00 : STA.w SprX, Y
   LDA $01 : STA.w SprXH, Y
-  
+
   LDA $02 : STA.w SprY, Y
   LDA $03 : STA.w SprYH, Y
 
-  LDA.b #$30 : STA.w SprTimerA, Y  
+  LDA.b #$30 : STA.w SprTimerA, Y
   LDA #$1C : STA.w $012C
   RTL
 }
@@ -1620,17 +1620,17 @@ Sprite_Ganon_Draw:
   .nextTile
 
   PHX ; Save current Tile Index?
-      
+
   TXA : CLC : ADC $06 ; Add Animation Index Offset
 
   PHA ; Keep the value with animation index offset?
 
-  ASL A : TAX 
+  ASL A : TAX
 
   REP #$20
 
   LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
-  AND.w #$0100 : STA $0E 
+  AND.w #$0100 : STA $0E
   INY
   LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
   CLC : ADC #$0010 : CMP.w #$0100
@@ -1647,14 +1647,14 @@ Sprite_Ganon_Draw:
   INY
   LDA .properties, X : STA ($90), Y
 
-  PHY 
-      
+  PHY
+
   TYA : LSR #2 : TAY
-      
+
   LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
-      
+
   PLY : INY
-      
+
   PLX : DEX : BPL .nextTile
 
   PLX
@@ -1686,17 +1686,17 @@ Sprite_Ganon_Draw:
 
 ApplyDarkLinkGraphics:
 {
-    PHX 
+    PHX
     REP #$20               ; A = 16, XY = 8
     LDX #$80 : STX $2100   ; turn the screen off (required)
     LDX #$80 : STX $2115   ; Set the video port register every time we write it increase by 1
     LDA #$5000 : STA $2116 ; Destination of the DMA $5800 in vram <- this need to be divided by 2
-    LDA #$1801 : STA $4300 ; DMA Transfer Mode and destination register 
+    LDA #$1801 : STA $4300 ; DMA Transfer Mode and destination register
                            ; "001 => 2 registers write once (2 bytes: p, p+1)"
     LDA.w #DarkLinkGraphics : STA $4302     ; Source address where you want gfx from ROM
     LDX.b #DarkLinkGraphics>>16 : STX $4304
     LDA   #$2000 : STA $4305                ; Size of the transfer 4 sheets of $800 each
-    LDX   #$01 : STX $420B                  ; Do the DMA 
+    LDX   #$01 : STX $420B                  ; Do the DMA
     LDX #$0F : STX $2100                    ; Turn the screen back on
     SEP #$30
     PLX
diff --git a/Sprites/Bosses/king_dodongo.asm b/Sprites/Bosses/king_dodongo.asm
index 66cd505..2f52b9e 100644
--- a/Sprites/Bosses/king_dodongo.asm
+++ b/Sprites/Bosses/king_dodongo.asm
@@ -16,7 +16,7 @@ KingDodongo_NewHealthSystem:
 
   RTL
 
-.phase_table
+  .phase_table
   db $03, $03, $03, $03, $03, $03, $03, $03
   db $03, $03, $03, $03, $02, $02, $02, $02
   db $02, $02, $01, $01, $01, $01, $01, $01
@@ -28,29 +28,25 @@ pushpc
 ; Adjust leg position to remove gap
 org $1E87F5
 .offset_x
-#_1E87F5: db -22, -22,  22,  22
-
+db -22, -22,  22,  22
 .offset_y
-#_1E87F9: db -28,   8, -28,   8
-
+db -28,   8, -28,   8
 .char
-#_1E87FD: db $A2, $A6, $A2, $A6
-
+db $A2, $A6, $A2, $A6
 .prop
-#_1E8801: db $0B, $0B, $4B, $4B
+db $0B, $0B, $4B, $4B
 
 org $1E8266
 AND.b #$15
 
 org $1E818C
 .speed_x
-#_1E818C: db -16, -16,  -8,   0,   8,  16,  16,   0
-
+db -16, -16,  -8,   0,   8,  16,  16,   0
 .speed_y
-#_1E8194: db   0,   8,  16,  16,  16,   8,   0,  16
+db   0,   8,  16,  16,  16,   8,   0,  16
 
 org $1E811A
 JSL KingDodongo_NewHealthSystem
 NOP #5
 
-pullpc
\ No newline at end of file
+pullpc
diff --git a/Sprites/Bosses/kydreeok_head.asm b/Sprites/Bosses/kydreeok_head.asm
index 1924141..e19b976 100644
--- a/Sprites/Bosses/kydreeok_head.asm
+++ b/Sprites/Bosses/kydreeok_head.asm
@@ -35,7 +35,6 @@
 Sprite_KydreeokHead_Long:
 {
   PHB : PHK : PLB
-
   LDA.w SprAction, X : CMP #$05 : BEQ .no_head
     JSR Sprite_KydreeokHead_Draw
   .no_head
@@ -43,9 +42,8 @@ Sprite_KydreeokHead_Long:
   JSL Sprite_CheckActive : BCC .not_active
     JSR Sprite_KydreeokHead_Main
   .not_active
-
-  PLB ; Get back the databank we stored previously
-  RTL ; Go back to original code
+  PLB
+  RTL
 }
 
 ; =========================================================
@@ -53,11 +51,9 @@ Sprite_KydreeokHead_Long:
 Sprite_KydreeokHead_Prep:
 {
   PHB : PHK : PLB
-
   LDA.b #$C0 : STA.w SprHealth, X
   LDA.b #$09 : STA.w SprBump,   X ; bump damage type
   STZ.w SprMiscE, X
-
   PLB
   RTL
 }
diff --git a/Sprites/Bosses/manhandla.asm b/Sprites/Bosses/manhandla.asm
index f4d8ef1..0ff68f2 100644
--- a/Sprites/Bosses/manhandla.asm
+++ b/Sprites/Bosses/manhandla.asm
@@ -37,31 +37,25 @@
 Sprite_Manhandla_Long:
 {
   PHB : PHK : PLB
-
   JSR Sprite_Manhandla_CheckForNextPhaseOrDeath
-
   LDA.w SprMiscD, X : CMP.b #$02 : BCC .phase1
     JSR Sprite_BigChuchu_Draw
     JMP .continue
   .phase1
     JSR Sprite_Manhandla_Draw
   .continue
-  JSL Sprite_CheckActive   ; Check if game is not paused
-  BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
-
-  JSR Sprite_Manhandla_Main ; Call the main sprite code
-
+  JSL Sprite_CheckActive : BCC .SpriteIsNotActive
+    JSR Sprite_Manhandla_Main
   .SpriteIsNotActive
-  PLB ; Get back the databank we stored previously
-  RTL ; Go back to original code
+  PLB
+  RTL
 }
 
 pushpc
 
 ; Sprite_DoTheDeath#PrepareEnemyDrop.post_death_stuff
 org $06FA25
-  #_06FA25: LDA.w $0E20,X
-  #_06FA28: CMP.b #$88
+  LDA.w $0E20, X : CMP.b #$88
 
 pullpc
 
@@ -70,13 +64,11 @@ pullpc
 Sprite_Manhandla_Prep:
 {
   PHB : PHK : PLB
-
   LDA.b #$04 : STA $36          ; Stores initial movement speeds
   LDA.b #$06 : STA $0428        ; Allows BG1 to move
   LDA.b #$80 : STA.w SprDefl, X
   LDA.b #$80 : STA.w SprHealth, X
   LDA.w SprSubtype, X : STA.w SprAction, X
-
   PLB
   RTL
 }
@@ -130,39 +122,39 @@ Sprite_Manhandla_CheckForNextPhaseOrDeath:
 ; =========================================================
 
 macro SetLeftHeadPos()
-    REP #$20
-    LDA.w SprCachedX : SEC : SBC.w #$0016
-    SEP #$20
-    STA.w SprX, Y : XBA : STA.w SprXH, Y
+  REP #$20
+  LDA.w SprCachedX : SEC : SBC.w #$0016
+  SEP #$20
+  STA.w SprX, Y : XBA : STA.w SprXH, Y
 
-    REP #$20
-    LDA.w SprCachedY : SEC : SBC.w #$000F
-    SEP #$20
-    STA.w SprY, Y : XBA : STA.w SprYH, Y
+  REP #$20
+  LDA.w SprCachedY : SEC : SBC.w #$000F
+  SEP #$20
+  STA.w SprY, Y : XBA : STA.w SprYH, Y
 endmacro
 
 macro SetRightHeadPos()
-    REP #$20
-    LDA.w SprCachedX : CLC : ADC.w #$0016
-    SEP #$20
-    STA.w SprX, Y : XBA : STA.w SprXH, Y
+  REP #$20
+  LDA.w SprCachedX : CLC : ADC.w #$0016
+  SEP #$20
+  STA.w SprX, Y : XBA : STA.w SprXH, Y
 
-    REP #$20
-    LDA.w SprCachedY : SEC : SBC.w #$000F
-    SEP #$20
-    STA.w SprY, Y : XBA : STA.w SprYH, Y
+  REP #$20
+  LDA.w SprCachedY : SEC : SBC.w #$000F
+  SEP #$20
+  STA.w SprY, Y : XBA : STA.w SprYH, Y
 endmacro
 
 macro SetCenterHeadPos()
-    REP #$20
-    LDA.w SprCachedX
-    SEP #$20
-    STA.w SprX, Y : XBA : STA.w SprXH, Y
+  REP #$20
+  LDA.w SprCachedX
+  SEP #$20
+  STA.w SprX, Y : XBA : STA.w SprXH, Y
 
-    REP #$20
-    LDA.w SprCachedY
-    SEP #$20
-    STA.w SprY, Y : XBA : STA.w SprYH, Y
+  REP #$20
+  LDA.w SprCachedY
+  SEP #$20
+  STA.w SprY, Y : XBA : STA.w SprYH, Y
 endmacro
 
 Sprite_Manhandla_Main: