Reformatted handshake command code