Refactor highscores