Refactor status