Improve the template
Cleanup