Just some small improvements

Tip: Trailing whitespace pollutes the changesets. Set your editor to remove them automatically, each time you save a file.

The other changes are self-explanatory.