Cells class - clean up and standardize