Cleaned up eval code