Networking refactoring

Small details left behind