continued request handling refactoring