Comment clean-ups