refactor, better highscores