Changes as per pull request review feedback.