more comments clean-up