cleanup generator
improve plugin