Revert "minor fixes to white space and comments"

This reverts commit 51bee821e1f72ec4f6000f01001dd0ceb827f17d.
minor changes to whitespace and comments