Comments and clean-up.