Change template placeholder
Cleanup generator