More refactoring
Minor TcpStream changes