diff --git a/internal/room/containers.go b/internal/room/containers.go
index 35a1957..538599f 100644
--- a/internal/room/containers.go
+++ b/internal/room/containers.go
@@ -3,10 +3,42 @@ package room
 import (
 	"context"
 	"fmt"
+	"time"
 
 	dockerTypes "github.com/docker/docker/api/types"
+
+	"m1k1o/neko_rooms/internal/types"
 )
 
+
+func (manager *RoomManagerCtx) containerToEntry(container dockerTypes.Container) (*types.RoomEntry, error) {
+	roomName, ok := container.Labels["m1k1o.neko_rooms.name"]
+	if !ok {
+		return nil, fmt.Errorf("Damaged container labels: name not found.")
+	}
+
+	URL, ok := container.Labels["m1k1o.neko_rooms.url"]
+	if !ok {
+		return nil, fmt.Errorf("Damaged container labels: url not found.")
+	}
+
+	epr, err := manager.getEprFromLabels(container.Labels)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.RoomEntry{
+		ID:             container.ID,
+		URL:            URL,
+		Name:           roomName,
+		MaxConnections: epr.Max - epr.Min + 1,
+		Image:          container.Image,
+		Running:        container.State == "running",
+		Status:         container.Status,
+		Created:        time.Unix(container.Created, 0),
+	}, nil
+}
+
 func (manager *RoomManagerCtx) listContainers() ([]dockerTypes.Container, error) {
 	containers, err := manager.client.ContainerList(context.Background(), dockerTypes.ContainerListOptions{ All: true })
 	if err != nil {
diff --git a/internal/room/manager.go b/internal/room/manager.go
index 348de84..4941867 100644
--- a/internal/room/manager.go
+++ b/internal/room/manager.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"time"
 
 	dockerTypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
@@ -55,31 +54,12 @@ func (manager *RoomManagerCtx) List() ([]types.RoomEntry, error) {
 
 	result := []types.RoomEntry{}
 	for _, container := range containers {
-		roomName, ok := container.Labels["m1k1o.neko_rooms.name"]
-		if !ok {
-			return nil, fmt.Errorf("Damaged container labels: name not found.")
-		}
-
-		URL, ok := container.Labels["m1k1o.neko_rooms.url"]
-		if !ok {
-			return nil, fmt.Errorf("Damaged container labels: url not found.")
-		}
-
-		epr, err := manager.getEprFromLabels(container.Labels)
+		entry, err := manager.containerToEntry(container)
 		if err != nil {
 			return nil, err
-		}
+		}	
 
-		result = append(result, types.RoomEntry{
-			ID:             container.ID,
-			URL:            URL,
-			Name:           roomName,
-			MaxConnections: epr.Max - epr.Min + 1,
-			Image:          container.Image,
-			Running:        container.State == "running",
-			Status:         container.Status,
-			Created:        time.Unix(container.Created, 0),
-		})
+		result = append(result, *entry)
 	}
 
 	return result, nil