Cleaning up the Robot Class