Refactor by removing Cell type