global refactoring continued

Loading data from Net