Some cleanup to comments.