Correcting pull request according to code review of pull request.