refactor, rename
adds TOC code comments and documentation