diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
index c944a293510..0de25d099b1 100644
--- a/internal/grpc/services/gateway/storageprovider.go
+++ b/internal/grpc/services/gateway/storageprovider.go
@@ -122,15 +122,17 @@ func (s *svc) ListStorageSpaces(ctx context.Context, req *provider.ListStorageSp
 		}
 	}
 
-	var providers []*registry.ProviderInfo
-	var err error
+	var (
+		providers []*registry.ProviderInfo
+		err       error
+	)
 	c, err := pool.GetStorageRegistryClient(s.c.StorageRegistryEndpoint)
 	if err != nil {
 		return nil, errors.Wrap(err, "gateway: error getting storage registry client")
 	}
 
 	if id != nil {
-		// query that specific story provider
+		// query that specific storage provider
 		parts := strings.SplitN(id.OpaqueId, "!", 2)
 		if len(parts) != 2 {
 			return &provider.ListStorageSpacesResponse{
@@ -183,8 +185,8 @@ func (s *svc) ListStorageSpaces(ctx context.Context, req *provider.ListStorageSp
 
 	spacesFromProviders := make([][]*provider.StorageSpace, len(providers))
 	errors := make([]error, len(providers))
-	var wg sync.WaitGroup
 
+	var wg sync.WaitGroup
 	for i, p := range providers {
 		wg.Add(1)
 		go s.listStorageSpacesOnProvider(ctx, req, &spacesFromProviders[i], p, &errors[i], &wg)
diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go
index d2f649d454c..03208cbc95c 100644
--- a/pkg/storage/utils/decomposedfs/decomposedfs.go
+++ b/pkg/storage/utils/decomposedfs/decomposedfs.go
@@ -234,7 +234,7 @@ func (fs *Decomposedfs) createStorageSpace(spaceType, nodeID string) error {
 	// we can reuse the node id as the space id
 	err := os.Symlink("../../nodes/"+nodeID, filepath.Join(fs.o.Root, "spaces", spaceType, nodeID))
 	if err != nil {
-		fmt.Printf("could not create symlink for personal space %s, %s\n", nodeID, err)
+		fmt.Printf("could not create symlink for '%s' space %s, %s\n", spaceType, nodeID, err)
 	}
 
 	return nil
@@ -507,8 +507,10 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
 	// /nodes/root/personal/foo and /nodes/root/shares/foo might be two very different spaces, a /nodes/root/foo is not expressive enough
 	// we would not need /nodes/root if access always happened via spaceid+relative path
 
-	spaceType := "*"
-	spaceID := "*"
+	var (
+		spaceType = "*"
+		spaceID   = "*"
+	)
 
 	for i := range filter {
 		switch filter[i].Type {
@@ -557,8 +559,6 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
 
 			// TODO apply more filters
 
-			// build return value
-
 			space := &provider.StorageSpace{
 				// FIXME the driver should know its id move setting the spaceid from the storage provider to the drivers
 				//Id: &provider.StorageSpaceId{OpaqueId: "1284d238-aa92-42ce-bdc4-0b0000009157!" + n.ID},
@@ -577,7 +577,6 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
 					// do not list shares as spaces for the owner
 					continue
 				}
-				// return folder name?
 				space.Name = n.Name
 			} else {
 				space.Name = "root" // do not expose the id as name, this is the root of a space