Optimization, added HTML classes for scores