- TOC clean-up and consistency changes