Cleaned up pull request.