refactoring
refactoring
refactor GameState
refactor usage of handlers
refactoring
refactoring