gofmt, cleanup