Refactoring of evaluation.rb

Just a quick refactoring of evaluation.rb to eliminate unnecessary flags.  All tests still pass and it is still functional.