tidied up the response formats