Clean-up and add GOlang tokens