rewrap a couple of lines, and drop some trailing whitespace