remove the warning info and add some comments