Remove and add some comments