minor template refactor