diff --git a/src/ui/handlers/starter-select-ui-handler.ts b/src/ui/handlers/starter-select-ui-handler.ts
index ff63ab6fb23..2e6d04e5cee 100644
--- a/src/ui/handlers/starter-select-ui-handler.ts
+++ b/src/ui/handlers/starter-select-ui-handler.ts
@@ -2760,13 +2760,13 @@ export class StarterSelectUiHandler extends MessageUiHandler {
       variant: props.variant,
       formIndex: props.formIndex,
       female: props.female,
-      abilityIndex: abilityIndex,
+      abilityIndex,
       passive: !(starterDataEntry.passiveAttr ^ (PassiveAttr.ENABLED | PassiveAttr.UNLOCKED)),
-      nature: nature,
-      moveset: moveset,
+      nature,
+      moveset,
       pokerus: this.pokerusSpecies.includes(species),
       nickname: this.starterPreferences[species.speciesId]?.nickname,
-      teraType: teraType,
+      teraType,
       ivs: dexEntry.ivs,
     };
 
diff --git a/test/test-utils/game-manager-utils.ts b/test/test-utils/game-manager-utils.ts
index 361ce739382..f08311852e0 100644
--- a/test/test-utils/game-manager-utils.ts
+++ b/test/test-utils/game-manager-utils.ts
@@ -62,7 +62,7 @@ export function generateStarters(scene: BattleScene, speciesIds?: SpeciesId[]):
 }
 
 function getTestRunStarters(seed: string, speciesIds?: SpeciesId[]): Starter[] {
-  if (!speciesIds || !speciesIds.length) {
+  if (!speciesIds || speciesIds.length === 0) {
     return getDailyRunStarters(seed);
   }
   const starters: Starter[] = [];
@@ -73,7 +73,7 @@ function getTestRunStarters(seed: string, speciesIds?: SpeciesId[]): Starter[] {
     const starterSpecies = getPokemonSpecies(starterSpeciesForm.speciesId);
     const pokemon = new PlayerPokemon(starterSpecies, startingLevel, undefined, 0);
     const starter: Starter = {
-      speciesId: speciesId,
+      speciesId,
       shiny: pokemon.shiny,
       variant: pokemon.variant,
       formIndex: pokemon.formIndex,