Cosmetic code cleanup, improved some comments.
Cosmetic white-space cleanup.