Removed commented out EvalExpression code
tidying up
Reworked static/instance methods in .ts