Comment clean-up