doc clean-up and format name change

**NOT READY FOR MERGE**
same