Evaluations Module Best Practice Changes

More changes to follow best practices. This time it focuses on the
evaluations module.