Refactoring with naming cells