Some more clean up of comments.