remove/add some comments