Refactoring CellLinker class