Refactor Raw and general response calls into methods and stop using channels