Robot name - Revision 4

Refactored the code again. 
I really like this `.tap` pattern