Refactored network stuff a bit