Some cleanup on the comments.