Refactor request