Feedback from CR for pull request #2