Fix minor typos, improve formatting
(cherry picked from commit 9b93f1672e3b5af7c7c2b867e7eb5882bce54468)