Clean up doc indents
Rearrangements and oversights