MarsRover refactoring