cleaning, some more comments