Refactoring for readability
Better leaderboard