Tidy up trailing whitespace