half of the refactoring done
refactor score and record just a bit