Cleaning up whitespace and cosmetic issues.  Recommendations from @thbishop and @bweavnet.