Comment cleanup.

Cleaned up the code a bit, especially the comments.