Teplate files refactoring

Tidy up comments for consistency.