Add comments, clean up.