Robot name - Revision 4

Refactored the code again.