More consistent comments (Op)