Pull request refactoring