minor changes as per the PR review.