refactored network clients