Cleanup; enhance getLeadingPlayers