Some editing of style and markdown
(cherry picked from commit c0f7c2aa9213c8d12c479622eff7758920530a71)