Incorporate suggested improvements to the docs