Refactor cell status