Streamlined the content output template to remove duplication