Cleanup do_request to be less ugly
Merge branch 'fix-refactor-do_request'