Response to pull request comments from commit 4a93030adfe8b978f8dee67e4eec93c3704430ea