Modification based on Pull Request comments.