Streamlined the content output template to remove duplication
Merge pull request #15 from LaurentGoderre/streamline-content-output

Streamlined the content output template to remove duplication