comment clean-up