Cleaning up for pull request.