Some refactoring done on Cell methods