Rewording

Not sure if the rewording is much better.
Rewording and reformatting plaintext

Is this rewording unwieldy?
Merge branch 'master' into pr/450