removed and added some comments