Refactor templates in parade