refactoring
oops
double oops
AbstractCell refactoring