diff --git a/README.md b/README.md
index 9601da0..2bf5678 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 # Card Game
 
 ```plantuml
-CardGame o-- Pile
-class CardGame {
+Game o-- Pile
+class Game {
     int numberOfPlayers;
     public Player[] players;
     Pile pot;
     Pile draws;
     
-    public CardGame(int numberOfCards, int numberOfPlayers)
+    public Game(int numberOfCards, int numberOfPlayers)
     private void createPlayersWithCards(int numberOfPlayers, Pile deck)
     public void play()
 }
diff --git a/src/CardGame.java b/src/Game.java
similarity index 96%
rename from src/CardGame.java
rename to src/Game.java
index 4191a65..044763e 100644
--- a/src/CardGame.java
+++ b/src/Game.java
@@ -1,6 +1,6 @@
 import java.util.ArrayList;
 
-public class CardGame {
+public class Game {
     Player[] players;
     final Pile pot = new Pile();
     final Pile draws = new Pile();
@@ -10,7 +10,7 @@ public class CardGame {
      * @param numberOfCards   Total number of cards
      * @param numberOfPlayers Total number of players
      */
-    public CardGame(int numberOfCards, int numberOfPlayers) {
+    public Game(int numberOfCards, int numberOfPlayers) {
         Pile deck = Pile.createDeck(numberOfCards);
         createPlayersWithCards(numberOfPlayers, deck);
         this.numberOfPlayers = numberOfPlayers;
diff --git a/src/CardGameTest.java b/src/GameTest.java
similarity index 59%
rename from src/CardGameTest.java
rename to src/GameTest.java
index ed6b202..5869ef3 100644
--- a/src/CardGameTest.java
+++ b/src/GameTest.java
@@ -3,26 +3,26 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class CardGameTest {
-    CardGame cardGame;
+class GameTest {
+    Game game;
 
     @org.junit.jupiter.api.Test
 
     @BeforeEach
     void setUp() {
-        cardGame = new CardGame(10, 2);
+        game = new Game(10, 2);
     }
 
     @Test
     void createDeck() {
-        assertEquals(2, cardGame.players.length);
+        assertEquals(2, game.players.length);
         for (int i = 0; i < 2; i++) {
-            assertEquals(20, cardGame.players[i].drawPile.size());
+            assertEquals(20, game.players[i].drawPile.size());
         }
     }
 
     @Test
     void play() {
-        cardGame.play();
+        game.play();
     }
 }
\ No newline at end of file
diff --git a/src/Main.java b/src/Main.java
index c0f00f7..318b29f 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -4,8 +4,8 @@
 public class Main {
 
     public static void main(String[] args) {
-        CardGame cardGame = new CardGame(10, 2);
-        cardGame.play();
-        Out.toConsole();
+        Game game = new Game(10, 2);
+        game.play();
+        System.out.print(Out.get());
     }
 }
diff --git a/src/Out.java b/src/Out.java
index e11b0aa..68cc084 100644
--- a/src/Out.java
+++ b/src/Out.java
@@ -1,18 +1,24 @@
+import java.util.ArrayList;
+
 public class Out {
-    static final String[] output = new String[50000];
-    static int line = 0;
+    static final ArrayList<String> output = new ArrayList<>();
+
+    private Out() { throw new IllegalStateException("Utility class"); }
 
     public static void println(String string) {
-        output[line++] = string;
+        output.add(string);
     }
 
     public static void println() {
-        output[line++] = "";
+        println("");
     }
 
-    public static void toConsole() {
-        for (int i = 0; i < line; i++) {
-            System.out.println(output[i]);
+    public static String get() {
+        StringBuilder string = new StringBuilder();
+        for (String s : output) {
+            string.append(s);
+            string.append("\n");
         }
+        return string.toString();
     }
 }
diff --git a/src/PlayerTest.java b/src/PlayerTest.java
deleted file mode 100644
index 8bb5398..0000000
--- a/src/PlayerTest.java
+++ /dev/null
@@ -1,6 +0,0 @@
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class PlayerTest {
-
-}
\ No newline at end of file