Fine-tuning comments and other clean-up.