Exercises: make the template cleaner