doc clean-up and format name changes

~~**NOT READY FOR MERGE**~~