statuscodes cleaned up