Small fixes: rewrap, trailing whitespace