diff --git a/kubernetes/typed/events/v1beta1/event_expansion.go b/kubernetes/typed/events/v1beta1/event_expansion.go
index 464fff91..562f8d5e 100644
--- a/kubernetes/typed/events/v1beta1/event_expansion.go
+++ b/kubernetes/typed/events/v1beta1/event_expansion.go
@@ -82,8 +82,7 @@ func (e *events) UpdateWithEventNamespace(event *v1beta1.Event) (*v1beta1.Event,
 // It returns the copy of the event that the server returns, or an error.
 // The namespace and name of the target event is deduced from the event.
 // The namespace must either match this event client's namespace, or this event client must
-//
-//	have been created with the "" namespace.
+// have been created with the "" namespace.
 func (e *events) PatchWithEventNamespace(event *v1beta1.Event, data []byte) (*v1beta1.Event, error) {
 	if e.ns != "" && event.Namespace != e.ns {
 		return nil, fmt.Errorf("can't patch an event with namespace '%v' in namespace '%v'", event.Namespace, e.ns)
diff --git a/rest/client.go b/rest/client.go
index 2cf821bc..60df7e56 100644
--- a/rest/client.go
+++ b/rest/client.go
@@ -52,8 +52,7 @@ type Interface interface {
 // ClientContentConfig controls how RESTClient communicates with the server.
 //
 // TODO: ContentConfig will be updated to accept a Negotiator instead of a
-//
-//	NegotiatedSerializer and NegotiatedSerializer will be removed.
+// NegotiatedSerializer and NegotiatedSerializer will be removed.
 type ClientContentConfig struct {
 	// AcceptContentTypes specifies the types the client will accept and is optional.
 	// If not set, ContentType will be used to define the Accept header
diff --git a/tools/watch/until.go b/tools/watch/until.go
index 81d4ff0d..27080c16 100644
--- a/tools/watch/until.go
+++ b/tools/watch/until.go
@@ -101,8 +101,7 @@ func UntilWithoutRetry(ctx context.Context, watcher watch.Interface, conditions
 // It guarantees you to see all events and in the order they happened.
 // Due to this guarantee there is no way it can deal with 'Resource version too old error'. It will fail in this case.
 // (See `UntilWithSync` if you'd prefer to recover from all the errors including RV too old by re-listing
-//
-//	those items. In normal code you should care about being level driven so you'd not care about not seeing all the edges.)
+// those items. In normal code you should care about being level driven so you'd not care about not seeing all the edges.)
 //
 // The most frequent usage for Until would be a test where you want to verify exact order of events ("edges").
 func Until(ctx context.Context, initialResourceVersion string, watcherClient cache.Watcher, conditions ...ConditionFunc) (*watch.Event, error) {
diff --git a/util/testing/fake_openapi_handler.go b/util/testing/fake_openapi_handler.go
index b6e4d668..b957b420 100644
--- a/util/testing/fake_openapi_handler.go
+++ b/util/testing/fake_openapi_handler.go
@@ -41,9 +41,9 @@ type FakeOpenAPIServer struct {
 // API server.
 //
 // specsPath - Give a path to some test data organized so that each GroupVersion
+// has its own OpenAPI V3 JSON file.
 //
-//	has its own OpenAPI V3 JSON file.
-//		i.e. apps/v1beta1 is stored in <specsPath>/apps/v1beta1.json
+//	i.e. apps/v1beta1 is stored in <specsPath>/apps/v1beta1.json
 func NewFakeOpenAPIV3Server(specsPath string) (*FakeOpenAPIServer, error) {
 	mux := &testMux{
 		counts: map[string]int{},