rough cleanup of template commenting and format, retitled one word files to match template title