diff --git a/src/mind_reader/state/session_state.py b/src/mind_reader/state/session_state.py
index 6f7c48c..627ffbe 100644
--- a/src/mind_reader/state/session_state.py
+++ b/src/mind_reader/state/session_state.py
@@ -32,27 +32,26 @@ class SessionState:
         return len(self._guesser_moves)
 
     def _get_setter_card_state(self, index: int) -> CardState:
-        current_index = len(self._setter_moves)
+        completed = self._completed_move_count
 
-        if index > current_index:
+        if index > completed:
             return CardState.SETTER_NOT_SET
 
-        elif index == current_index:
-            if self._step_state == StepState.WAITING_FOR_GUESSER:
-                if self._local_player.role == PlayerRole.SETTER:
-                    return CardState.SETTER_REVEALED
-                else:
-                    return CardState.SETTER_HIDDEN
+        elif index == completed:
+            if self._local_player.role == PlayerRole.SETTER:
+                return CardState.SETTER_REVEALED
+            else:
+                return CardState.SETTER_HIDDEN
 
         return CardState.SETTER_REVEALED
 
     def _get_guesser_card_state(self, index: int) -> CardState:
-        completed_move_count = self._completed_move_count
+        completed = self._completed_move_count
 
-        if index > completed_move_count:
+        if index > completed:
             return CardState.GUESSER_DISABLED
 
-        elif index == completed_move_count:
+        elif index == completed:
             if self._step_state == StepState.WAITING_FOR_GUESSER:
                 return CardState.GUESSER_WAITING
             else: