Cleaning up some of the network parsing