Added content templates, formatted comments