diff --git a/src/phases/move-end-phase.ts b/src/phases/move-end-phase.ts
index 3b711940be6..22a80897bc9 100644
--- a/src/phases/move-end-phase.ts
+++ b/src/phases/move-end-phase.ts
@@ -19,7 +19,7 @@ export class MoveEndPhase extends PokemonPhase {
 
     const pokemon = this.getPokemon();
     if (pokemon.isActive(true)) {
-      pokemon.  lapseTags(BattlerTagLapseType.AFTER_MOVE);
+      pokemon.lapseTags(BattlerTagLapseType.AFTER_MOVE);
     }
     globalScene.arena.setIgnoreAbilities(false);
 
diff --git a/src/phases/obtain-status-effect-phase.ts b/src/phases/obtain-status-effect-phase.ts
index 55ea30002d7..0716651b4a6 100644
--- a/src/phases/obtain-status-effect-phase.ts
+++ b/src/phases/obtain-status-effect-phase.ts
@@ -46,7 +46,7 @@ export class ObtainStatusEffectPhase extends PokemonPhase {
               this.sourceText ?? undefined,
             ),
           );
-          if (this.statusEffect && this.statusEffect !== StatusEffect.FAINT) {
+          if (!isNullOrUndefined(this.statusEffect) && this.statusEffect !== StatusEffect.FAINT) {
             globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeStatusEffectTrigger, true);
             // If mold breaker etc was used to set this status, it shouldn't apply to abilities activated afterwards
             globalScene.arena.setIgnoreAbilities(false);
diff --git a/src/phases/reset-status-phase.ts b/src/phases/reset-status-phase.ts
index 7dab2072c4e..0ba3559d9b7 100644
--- a/src/phases/reset-status-phase.ts
+++ b/src/phases/reset-status-phase.ts
@@ -9,9 +9,9 @@ import { StatusEffect } from "#enums/status-effect";
  * This is necessary to perform in a phase primarly to ensure that the status icon disappears at the correct time in the battle
  */
 export class ResetStatusPhase extends BattlePhase {
-  private pokemon: Pokemon;
-  private affectConfusion: boolean;
-  private reloadAssets: boolean;
+  private readonly pokemon: Pokemon;
+  private readonly affectConfusion: boolean;
+  private readonly reloadAssets: boolean;
 
   constructor(pokemon: Pokemon, affectConfusion: boolean, reloadAssets: boolean) {
     super();