rename handshakeTimeoutInMillis into handshakeTimeout
minor clean up