Refactor moved request