Code refactor with Nad (pairing)