First refactor of scoring project solution.