refactored scoring project.  Would still like to cut down on the number of conditionals without sacrificing readability