PCT-1185 Gofmt and renamed var