Comment clean-up & add.