TCP serial refactorings