Code clean up
Fixed adding scores