cleanup of commenting and TOC