Network command small refactoring