Add BestScore storing + some cleaning