Cleaned up end of game handling