address comments from PR