Moved around methods in Robot class

Signed-off-by: Tushar Pankaj <tushar.s.pankaj@gmail.com>
Removed problematic comment-within-comment

Signed-off-by: Tushar Pankaj <tushar.s.pankaj@gmail.com>