Additional clean up of template and content separation.