refactored magic numbers from gamestate