Additional refactoring of the Robot class

Enjoyed reading this code!