Refactoring and add mark cell