Cleanup, use displayTemplateName in disp template
Remove unnecessary comment