Refactor CellSize