Go: Cleanup source code.
Merge pull request #130 from tarndt/master

Go: Lite cleanup of source code