Create client handshake tools

Some minor cleanup as well.