Leaderboard Refactoring