Updated eval

minor clean-ups