code refactoring
add scores, style changes, refactoring