clean up a little
extract response helpers