more code cleanup around network data loader