Simplify includes in Eval.hs
Simple code refactoring