Refactor remote to add a simpler method