REFACTORING Highscore

Change-Id: I8fc7be428fb82489675202dc0109817a7f7dadb5
Signed-off-by: Martika <Martika@MC2>