Refactor Client to UdpClient