Refactoring request logic