minor formatting cleanup and removal of trailing whitespace.