gofmt cleanup