Some cleanup of comments