Add comments, cleanup.