Arjen refactor templates

newline