Clean up Generator class style.