Simplifying generator slightly