Small fixes

Rewrap, fix YAML style, remove empty lines and trailing whitespace.