[TIMOB-15400] Cleaned up the code
[TIMOB-15400] Fixed another related go() bug