more consistent comments