TCP server refactorings...
TCP server refactorings...