Style cleanup and remove trailing whitespace.