Clean move networking a bit