Cleaned up evaluation table using a generator