More UDPCLient refactorings