speed up networtk data processing
small changes/refactoring