clean some things up, make generator stuff more concise