Refactored Handshake*.cs