Refactoring Cell class