Arjen refactor templates