Lots of trailing whitespace gone now.