template-onboarding: refactoring.