Cleanup: part 1
Cleanup: big part #2, next fix index
Doc: main index