Refactor to highlight the different states of the game