Cell class - refactored