cleaned up GamestateInterface code