diff --git a/worlds/yachtdice/Options.py b/worlds/yachtdice/Options.py
index 81fbdd420f..df63e5cba2 100644
--- a/worlds/yachtdice/Options.py
+++ b/worlds/yachtdice/Options.py
@@ -212,9 +212,9 @@ class AddExtraPoints(Choice):
     If there is space, would you like bonus points shuffled in the item pool?
     They make the game a little bit easier, as they are not considered in the logic.
 
-    all_of_it: fill all locations with extra points
-    sure: put some bonus points in
-    never: do not put any bonus points
+    All Of It: fill all locations with extra points
+    Sure: put some bonus points in
+    Never: do not put any bonus points
     """
 
     display_name = "Extra bonus in the pool"
@@ -230,9 +230,9 @@ class AddStoryChapters(Choice):
     If there is space, would you like story chapters shuffled in the item pool?
     Note: if you have extra points on "all_of_it", there will not be story chapters.
 
-    all_of_it: fill all locations with story chapters
-    sure: if there is space left, put in 10 story chapters.
-    never: do not put any story chapters in, I do not like reading (but I am glad you are reading THIS!)
+    All Of It: fill all locations with story chapters
+    Sure: if there is space left, put in 10 story chapters.
+    Never: do not put any story chapters in, I do not like reading (but I am glad you are reading THIS!)
     """
 
     display_name = "Extra story chapters in the pool"
diff --git a/worlds/yachtdice/Rules.py b/worlds/yachtdice/Rules.py
index e7e848cd9e..4ed50e362c 100644
--- a/worlds/yachtdice/Rules.py
+++ b/worlds/yachtdice/Rules.py
@@ -244,10 +244,10 @@ def dice_simulation(state, player, options):
 
 # Sets rules on entrances and advancements that are always applied
 def set_yacht_rules(world: MultiWorld, player: int, options):
-    for l in world.get_locations(player):
+    for location in world.get_locations(player):
         set_rule(
-            l,
-            lambda state, curscore=l.yacht_dice_score, player=player: dice_simulation(state, player, options)
+            location,
+            lambda state, curscore=location.yacht_dice_score, player=player: dice_simulation(state, player, options)
             >= curscore,
         )
 
diff --git a/worlds/yachtdice/__init__.py b/worlds/yachtdice/__init__.py
index 2a4a4b6802..9369176cd9 100644
--- a/worlds/yachtdice/__init__.py
+++ b/worlds/yachtdice/__init__.py
@@ -14,7 +14,7 @@ class YachtDiceWeb(WebWorld):
     tutorials = [
         Tutorial(
             "Multiworld Setup Guide",
-            "A guide to setting up Yacht Dice. This guide covers " "single-player, multiworld, and website.",
+            "A guide to setting up Yacht Dice. This guide covers single-player, multiworld, and website.",
             "English",
             "setup_en.md",
             "setup/en",
@@ -143,10 +143,10 @@ class YachtDiceWorld(World):
         # Yacht Dice needs extra filler items so it doesn't get stuck in generation.
         # For now, we calculate the number of extra items we'll need later.
         if self.options.minimize_extra_items.value:
-            extraPercentage = max(0.1, 0.8 - self.multiworld.players / 10)
+            extra_percentage = max(0.1, 0.8 - self.multiworld.players / 10)
         else:
-            extraPercentage = 0.7
-        extra_locations_needed = max(10, math.ceil(already_items * extraPercentage))
+            extra_percentage = 0.7
+        extra_locations_needed = max(10, math.ceil(already_items * extra_percentage))
 
         # max score is the value of the last check. Goal score is the score needed to 'finish' the game
         self.max_score = self.options.score_for_last_check.value