diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/constants.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/constants.go
index 3bed214803310..c153f0594db5f 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/constants.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/constants.go
@@ -24,25 +24,26 @@ const (
 
 	// Version means current version of the API supported by kubelet
 	Version = "v1beta1"
+
 	// DevicePluginPath is the folder the Device Plugin is expecting sockets to be on
 	// Only privileged pods have access to this path
 	// Note: Placeholder until we find a "standard path"
 	DevicePluginPath = "/var/lib/kubelet/device-plugins/"
-	// KubeletSocket is the path of the Kubelet registry socket
-	KubeletSocket = DevicePluginPath + "kubelet.sock"
-
 	// DevicePluginPathWindows Avoid failed to run Kubelet: bad socketPath,
 	// must be an absolute path: /var/lib/kubelet/device-plugins/kubelet.sock
 	// https://github.com/kubernetes/kubernetes/issues/93262
 	// https://github.com/kubernetes/kubernetes/pull/93285#discussion_r458140701
 	DevicePluginPathWindows = "\\var\\lib\\kubelet\\device-plugins\\"
-	// KubeletSocketWindows is the path of the Kubelet registry socket on windows
-	KubeletSocketWindows = DevicePluginPathWindows + "kubelet.sock"
 
 	// KubeletPreStartContainerRPCTimeoutInSecs is the timeout duration in secs for PreStartContainer RPC
-	// Timeout duration in secs for PreStartContainer RPC
 	KubeletPreStartContainerRPCTimeoutInSecs = 30
 )
 
-// SupportedVersions provides a list of supported version
-var SupportedVersions = [...]string{"v1beta1"}
+var (
+	// KubeletSocket is the path of the Kubelet registry socket
+	KubeletSocket = DevicePluginPath + "kubelet.sock"
+	// KubeletSocketWindows is the path of the Kubelet registry socket on windows
+	KubeletSocketWindows = DevicePluginPathWindows + "kubelet.sock"
+	// SupportedVersions provides a list of supported version
+	SupportedVersions = [...]string{"v1beta1"}
+)