- Cleaned up NaiveGenerator