improve template to include comments