reformat and removed trailing whitespace