update templates for best practices