gofmt and minor changes