refactoring cell class