[codestyle] Remove new line under comment
[minor] Also listen for timeout to keeel the connection.