Implementing suggestions in pull request.