adjustments from PR review