make response status flow better