Refactoring Resquestor