Refactor main tableview cell creation