Combined TableView and CollectionView, Code optimization/simplify