add score class and code clean