Implemented changes from additional discussion of pull request