Refactor in request