Changes per review feedback for pull request 289