diff --git a/pkg/driver/controller_server.go b/pkg/driver/controller_server.go
index deb5c3d..e5a4d3c 100644
--- a/pkg/driver/controller_server.go
+++ b/pkg/driver/controller_server.go
@@ -589,23 +589,22 @@ func (d *Driver) ControllerGetCapabilities(context.Context, *csi.ControllerGetCa
 // CreateSnapshot is part of implementing Snapshot & Restore functionality, but we don't support that
 func (d *Driver) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "")
-
 	// TODO: Uncomment after client implementation is complete.
+	// snapshotName := req.GetName()
+	// sourceVolID := req.GetSourceVolumeId()
+	//
 	// log.Info().
-	// 	Str("snapshot_name", req.GetName()).
-	// 	Str("source_volume_id", req.GetSourceVolumeId()).
+	// 	Str("snapshot_name", snapshotName).
+	// 	Str("source_volume_id", sourceVolID).
 	// 	Msg("Request: CreateSnapshot")
 	//
-	// if len(req.GetName()) == 0 {
+	// if len(snapshotName) == 0 {
 	// 	return nil, status.Error(codes.InvalidArgument, "Snapshot name is required")
 	// }
-	// if len(req.GetSourceVolumeId()) == 0 {
+	// if len(sourceVolID) == 0 {
 	// 	return nil, status.Error(codes.InvalidArgument, "SourceVolumeId is required")
 	// }
 	//
-	// snapshotName := req.GetName()
-	// sourceVolID := req.GetSourceVolumeId()
-	//
 	// log.Debug().
 	// 	Str("source_volume_id", sourceVolID).
 	// 	Msg("Finding current snapshot in Civo API")