Simplify the Go stuff