Updated formatting, and removed shared template due to differences in preferred renderings