clean up generator interface a bit