RVRemote refactor