Refactor/use res status #145