Refactor: Cell class