Fixed Issue #10, Simplify evaluate.js