removed an obsolete comment
more cleanings and comments