remove and add some comments