Some commentary clean-up