code format changes: tabs-->spaces, trim end-of-line whitespace, etc.  no functional changes.