Add comments.  Clean up code.