Request Refactor finished