table cells refactoring