Clean up TOC, shorten. Ref #3