Refactor requests