diff --git a/pkg/apis/config/doc.go b/pkg/apis/config/doc.go
index ab67b85..cb0bdaa 100644
--- a/pkg/apis/config/doc.go
+++ b/pkg/apis/config/doc.go
@@ -2,5 +2,5 @@
 // +groupName="shoot-fleet-agent-service.extensions.config.gardener.cloud"
 
 //go:generate ../../../hack/update-codegen.sh
-//Package config that holds config api
+// Package config that holds config api
 package config
diff --git a/pkg/apis/config/loader/loader.go b/pkg/apis/config/loader/loader.go
index 4e7c6d5..ed245aa 100644
--- a/pkg/apis/config/loader/loader.go
+++ b/pkg/apis/config/loader/loader.go
@@ -13,9 +13,9 @@ import (
 )
 
 var (
-	//codec used to encode
+	// Codec used to encode
 	Codec runtime.Codec
-	//scheme to register
+	// Scheme to register
 	Scheme *runtime.Scheme
 )
 
diff --git a/pkg/controller/fleetmanager.go b/pkg/controller/fleetmanager.go
index 3fa3194..4f99ee9 100644
--- a/pkg/controller/fleetmanager.go
+++ b/pkg/controller/fleetmanager.go
@@ -17,7 +17,7 @@ type FleetManager struct {
 	namespace    string
 }
 
-//Constructs new manager with given config operating in given namespace
+// NewManagerForConfig constructs new manager with given config operating in given namespace
 func NewManagerForConfig(c *rest.Config, namespace string) (*FleetManager, error) {
 	secretClient, err := kubernetes.NewForConfig(c)
 	if err != nil {
@@ -36,22 +36,22 @@ func NewManagerForConfig(c *rest.Config, namespace string) (*FleetManager, error
 	}, nil
 }
 
-//registers a cluster in remote fleet
+// CreateCluster registers a cluster in remote fleet
 func (f *FleetManager) CreateCluster(ctx context.Context, cluster *v1alpha1.Cluster) (*v1alpha1.Cluster, error) {
 	return f.fleetClient.FleetV1alpha1().Clusters(f.namespace).Create(ctx, cluster, metav1.CreateOptions{})
 }
 
-//updates a cluster registration in remote fleet
+// UpdateCluster updates a cluster registration in remote fleet
 func (f *FleetManager) UpdateCluster(ctx context.Context, cluster *v1alpha1.Cluster) (*v1alpha1.Cluster, error) {
 	return f.fleetClient.FleetV1alpha1().Clusters(f.namespace).Update(ctx, cluster, metav1.UpdateOptions{})
 }
 
-//gets a cluster registration from remote fleet
+// GetCluster gets a cluster registration from remote fleet
 func (f *FleetManager) GetCluster(ctx context.Context, clusterName string) (*v1alpha1.Cluster, error) {
 	return f.fleetClient.FleetV1alpha1().Clusters(f.namespace).Get(ctx, clusterName, metav1.GetOptions{})
 }
 
-//registers a clusters kubeconfig secret in remote fleet
+// CreateKubeconfigSecret registers a clusters kubeconfig secret in remote fleet
 func (f *FleetManager) CreateKubeconfigSecret(ctx context.Context, secret *corev1.Secret) (*corev1.Secret, error) {
 	return f.secretClient.CoreV1().Secrets(f.namespace).Create(ctx, secret, metav1.CreateOptions{})
 }