refactored list view/collection view data source building
refactored list view/collection view data source building