template refactor: move the trimmed 'header' format to other stop templates