did a little cleanup, some freactoring of ntor handshake'