Cleaned up endgame