Changes based on Pull Request comments.