Remove and Add some comments