Refactoring Tableview and Cells