Clean code for remote_driver