edited templates for readability