reset some comments, and light code change