Rover refactoring