minor refactors to generators to verify my sanity