Changes after the code review (pull request)