Addressed comments on pull request.