Keep line length to 80, fix typo and remove trailing whitespace
Merge pull request #1196 from yous/patch-documentation

Keep line length to 80, fix typo and remove trailing whitespace