More comments.
Cleaned up code.