Refactor methods in scoring project, dice project