Refactoring according to the pull request comments