Various Go style fixes

Did you check that with a github request, I'd rather avoid having problems with it.