Tidy up. 80 columns and trailing whitespace.