Improved code
Cleaning template files