refactor scores calculator
refactor 2 of score calculator - this one is special