Cell properties refactoring