highScore step 7 + major refactor