Better Golang

#824059