basic refactoring to the rover