refactoring scaffold templates
refactoring scaffold templates