Adjustments from PR review