Make docs more consistent
Address PR comments
Merge pull request #808 from mgold/doc-consistencies

Make docs more consistent