Minor refactoring
Avoid normalizing templates