Rewrites, again
Rewriting
Refactor generators