Fix trailing whitespace issues