diff --git a/Sprites/NPCs/ranch_girl.asm b/Sprites/NPCs/ranch_girl.asm
index 8201c28..acefcdd 100644
--- a/Sprites/NPCs/ranch_girl.asm
+++ b/Sprites/NPCs/ranch_girl.asm
@@ -2,17 +2,9 @@
 ; Ranch Girl (Chicken Easter Egg Sprite)
 ; Gives Link the Ocarina
 
-pushpc
-org $05FA8E
-Sprite_ShowMessageMinimal:
-
-org $1AF92C
-SpriteDraw_RaceGameLady:
-
-org $1AF954
-Sprite_CheckIfActive_Bank1A:
-
-pullpc
+Sprite_ShowMessageMinimal = $05FA8E
+SpriteDraw_RaceGameLady =  $1AF92C
+Sprite_CheckIfActive_Bank1A = $1AF954
 
 RanchGirl_Message:
 {
@@ -48,48 +40,40 @@ RanchGirl_TeachSong:
 
   LDA #$01 : STA $7EF34C ; The item gives 02 by default, so decrement that for now
 
-.not_started
-.running_dialog
-.has_song
-  #_1AFEF4: LDA.b $1A
-  #_1AFEF6: LSR A
-  #_1AFEF7: LSR A
-  #_1AFEF8: LSR A
-  #_1AFEF9: LSR A
-  #_1AFEFA: AND.b #$01
-  #_1AFEFC: STA.w $0DC0,X
+  .not_started
+  .running_dialog
+  .has_song
+  LDA.b $1A
+  LSR A
+  LSR A
+  LSR A
+  LSR A
+  AND.b #$01
+  STA.w $0DC0,X
 
   RTL
 }
 
-
-
 pushpc
 
 org $01AFECF
 ChickenLady:
 {
-  #_1AFECF: JSR .main
-
-  #_1AFED2: RTL
+  JSR .main
+  RTL
 
   .main
-  #_1AFED3: LDA.b #$01
-  #_1AFED5: STA.w SprMiscC,X
+  LDA.b #$01 : STA.w SprMiscC, X
 
-  #_1AFED8: JSL SpriteDraw_RaceGameLady
-  #_1AFEDC: JSR Sprite_CheckIfActive_Bank1A
-
-  #_1AFEDF: LDA.w SprTimerA,X
-  #_1AFEE2: CMP.b #$01
-  #_1AFEE4: BNE .no_message
-
-  JSL RanchGirl_Message
+  JSL SpriteDraw_RaceGameLady
+  JSR Sprite_CheckIfActive_Bank1A
 
+  LDA.w SprTimerA, X : CMP.b #$01 : BNE .no_message
+    JSL RanchGirl_Message
   .no_message
   JSL RanchGirl_TeachSong
   .return
-  #_1AFEFF: RTS
+  RTS
 }
 
 assert pc() <= $01AFEFF
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 923157e..1ff331b 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -100,16 +100,13 @@ Graphics_Transfer:
 print "End of Sprites Bank 30            ", pc
 
 ; UnderworldTransition_ScrollRoom
-org $02BE5E
-  JSL Graphics_Transfer
+org $02BE5E : JSL Graphics_Transfer
 
 ; Whirlpool
-org $1EEEE4
-  JSL DontTeleportWithoutFlippers
+org $1EEEE4 : JSL DontTeleportWithoutFlippers
 
 ; SpriteDraw_Roller
-org $058EE6
-  JSL PutRollerBeneathLink
+org $058EE6 : JSL PutRollerBeneathLink
 
 ; =========================================================
 
@@ -198,8 +195,6 @@ Sprite_IceBlock = $D5
 incsrc "Sprites/Objects/ice_block.asm"
 print  "End of ice_block.asm              ",  pc
 
-; =========================================================
-
 incsrc "Sprites/NPCs/ranch_girl.asm"
 print  "End of Ranch Girl.asm             ", pc