Fix trailing whitespace tidy errors