Refactoring pull request