addressing pull request comments from will