cleaning up eval-exp