Second and third refactor, created a separate class of the evaluation and re named several variables so that the class would be more readable