Refactor status method