template-onboarding: refactoring