Additional refactoring of the Robot class

Nice