argument name changed in class Score,
cleanup