Starting to refactor the templates a bit
Refactoring