improvements from PR review