HH-40377 better TcpOptions
HH-40377 reformat code and optimize imports