More updates and cleanup

Cleaned up the Evaluator class and moved Expression logic to the
Expression class.

Improved the way expressions are parsed.