Minor refactoring of the cell object