clean up the response better