Implement changes suggested by Scott

- Implement changes suggested by Scott on pull request