Cleaned up MainActivity in RoverController