Refactor sans decoding of response