Cleaned up Evaluation.lam a bit