refactor cell class