gtp: go fmt fixes and some post-refactor refactoring ;-)