Cell refactor