Tidy up spaces at line ends

The eternal battle!