More work cleaning the comments.