Fix trailing whitespace and style, no functionality change