Cleaned up eval