address comments from previous PR