Addressed comments in pull request.