Changes made to accommodate the comments on the Pull Request