Request setup refactoring