Clean up generators template
Improve generator template