Cleaning some comments & commented code