Refactoring the request farm