Reorganized the construction of the cell to the custom class