Refactored rover.rb