[MOD] NetworkService clean code