diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/dentata-snakes/executor/terminate/boss_fight.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/dentata-snakes/executor/terminate/boss_fight.mcfunction
index 8c8868224..d7cc46f70 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/dentata-snakes/executor/terminate/boss_fight.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/dentata-snakes/executor/terminate/boss_fight.mcfunction
@@ -1,5 +1,5 @@
 # Set scores
-# TODO(49) determine how to control how long we wait after this attack finishes before
+# TODO(49): determine how to control how long we wait after this attack finishes before
 # letting boss fight start a new attack
 scoreboard players set @s boss-fight.attack.delay 20
 
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/friendliness-pellets/executor/terminate/boss_fight.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/friendliness-pellets/executor/terminate/boss_fight.mcfunction
index 8c8868224..d7cc46f70 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/friendliness-pellets/executor/terminate/boss_fight.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/friendliness-pellets/executor/terminate/boss_fight.mcfunction
@@ -1,5 +1,5 @@
 # Set scores
-# TODO(49) determine how to control how long we wait after this attack finishes before
+# TODO(49): determine how to control how long we wait after this attack finishes before
 # letting boss fight start a new attack
 scoreboard players set @s boss-fight.attack.delay 20
 
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/homing-vines/executor/terminate/boss_fight.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/homing-vines/executor/terminate/boss_fight.mcfunction
index 8c8868224..d7cc46f70 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/homing-vines/executor/terminate/boss_fight.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/homing-vines/executor/terminate/boss_fight.mcfunction
@@ -1,5 +1,5 @@
 # Set scores
-# TODO(49) determine how to control how long we wait after this attack finishes before
+# TODO(49): determine how to control how long we wait after this attack finishes before
 # letting boss fight start a new attack
 scoreboard players set @s boss-fight.attack.delay 20
 
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/executor/terminate/boss_fight.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/executor/terminate/boss_fight.mcfunction
index 8c8868224..d7cc46f70 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/executor/terminate/boss_fight.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/executor/terminate/boss_fight.mcfunction
@@ -1,5 +1,5 @@
 # Set scores
-# TODO(49) determine how to control how long we wait after this attack finishes before
+# TODO(49): determine how to control how long we wait after this attack finishes before
 # letting boss fight start a new attack
 scoreboard players set @s boss-fight.attack.delay 20
 
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/loop/summon_bullet.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/loop/summon_bullet.mcfunction
index 63e0a7369..b9d42b6fe 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/loop/summon_bullet.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/loop/summon_bullet.mcfunction
@@ -8,7 +8,7 @@
 # Toggle between dark-eye and bright-eye variants
 scoreboard players operation @s math.0 = @s attack.bullets.remaining
 scoreboard players operation @s math.0 %= #2 mathf.const
-# TODO(47) this needs to NOT be a distance check
+# TODO(47): this needs to NOT be a distance check
 execute if score @s math.0 matches 0 as @e[tag=aj.lower_eye.root,sort=nearest,limit=1] run function animated_java:lower_eye/apply_variant/dark
 execute if score @s math.0 matches 1 as @e[tag=aj.lower_eye.root,sort=nearest,limit=1] run function animated_java:lower_eye/apply_variant/bright
 
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/terminate.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/terminate.mcfunction
index 9c39bb8e0..959536ba9 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/terminate.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-lower/indicator/terminate.mcfunction
@@ -1,4 +1,4 @@
-# TODO(47) this needs to NOT be a distance check
+# TODO(47): this needs to NOT be a distance check
 execute as @e[tag=aj.lower_eye.root,sort=nearest,limit=1] run function animated_java:lower_eye/apply_variant/colorful
 
 # Kill the indicator
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/executor/terminate/boss_fight.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/executor/terminate/boss_fight.mcfunction
index 8c8868224..d7cc46f70 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/executor/terminate/boss_fight.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/executor/terminate/boss_fight.mcfunction
@@ -1,5 +1,5 @@
 # Set scores
-# TODO(49) determine how to control how long we wait after this attack finishes before
+# TODO(49): determine how to control how long we wait after this attack finishes before
 # letting boss fight start a new attack
 scoreboard players set @s boss-fight.attack.delay 20
 
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/loop/summon_bullet.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/loop/summon_bullet.mcfunction
index bfb549d6e..b0d2b9250 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/loop/summon_bullet.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/loop/summon_bullet.mcfunction
@@ -8,7 +8,7 @@
 # Toggle between dark-eye and bright-eye variants
 scoreboard players operation @s math.0 = @s attack.bullets.remaining
 scoreboard players operation @s math.0 %= #2 mathf.const
-# TODO(47) this needs to NOT be a distance check
+# TODO(47): this needs to NOT be a distance check
 execute if score @s math.0 matches 0 as @e[tag=aj.upper_eye.root,sort=nearest,limit=1] run function animated_java:upper_eye/apply_variant/dark
 execute if score @s math.0 matches 1 as @e[tag=aj.upper_eye.root,sort=nearest,limit=1] run function animated_java:upper_eye/apply_variant/bright
 
diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/terminate.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/terminate.mcfunction
index 45c5ffd54..9bc69f1c8 100644
--- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/terminate.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/x-bullets-upper/indicator/terminate.mcfunction
@@ -1,4 +1,4 @@
-# TODO(47) this needs to NOT be a distance check
+# TODO(47): this needs to NOT be a distance check
 execute as @e[tag=aj.upper_eye.root,sort=nearest,limit=1] run function animated_java:upper_eye/apply_variant/colorful
 
 # Kill the indicator
diff --git a/datapacks/omega-flowey/data/entity/functions/utils/damage.mcfunction b/datapacks/omega-flowey/data/entity/functions/utils/damage.mcfunction
index 21fc19250..0c9ed279f 100644
--- a/datapacks/omega-flowey/data/entity/functions/utils/damage.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/utils/damage.mcfunction
@@ -1,4 +1,4 @@
-# TODO(39) remove these `unless entity @e[tag=boss_fight]`/`if entity @e[tag=boss_fight]` checks when boss fight is fully setup
+# TODO(39): remove these `unless entity @e[tag=boss_fight]`/`if entity @e[tag=boss_fight]` checks when boss fight is fully setup
 # we have it here for development so that the boss entity (omega-flowey)
 # does not need to exist for attacks to damage.
 # `by @e[tag=boss_fight,limit=1]` is needed to have proper damage knockback + death messages ("killed by Omega Flowey")
diff --git a/datapacks/omega-flowey/data/entity/functions/utils/shake_screen.mcfunction b/datapacks/omega-flowey/data/entity/functions/utils/shake_screen.mcfunction
index daf6476a5..cc947b543 100644
--- a/datapacks/omega-flowey/data/entity/functions/utils/shake_screen.mcfunction
+++ b/datapacks/omega-flowey/data/entity/functions/utils/shake_screen.mcfunction
@@ -1,5 +1,5 @@
-# TODO(38) parameterize this function's yaw/pitch ranges
-# TODO(42) evaluate if these ranges (0.5..5 deg yaw, 0.5..2 deg pitch) are too little/too much screen shake
+# TODO(38): parameterize this function's yaw/pitch ranges
+# TODO(42): evaluate if these ranges (0.5..5 deg yaw, 0.5..2 deg pitch) are too little/too much screen shake
 # Shake player yaw anywhere from 0.5..5.0 degrees (can also be negative)
 execute store result score @s math.0 run random value 5..50
 execute store result score @s math.1 run random value 0..1