address pull request comments

 Address comments by @stdweird in the PR