TCP server refactorings...