Finish request refactor