Remove trailing white-space and some line wrapping.
Merge pull request #6731 from s0undt3ch/develop

Remove trailing white-space and some line wrapping.