Formatting fixes.  Stripped trailing whitespace.