tidying up status codes