diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ba9c06df1..2fd6fedfb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -30,6 +30,7 @@
       <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+      <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/gradle/build.gradle.kts b/gradle/build.gradle.kts
index c22be3b65..70b8351d8 100644
--- a/gradle/build.gradle.kts
+++ b/gradle/build.gradle.kts
@@ -49,7 +49,7 @@ tasks {
         dependsOn(doc)
         dependOnSubprojects()
         group = mainGroup
-        description = "Zips everything up for release into build/deploy"
+        description = "Zips everything up for release into ./build/deploy"
     }
 
     val release by creating {
@@ -73,7 +73,7 @@ tasks {
             println("""
             ===================================================
             Fertig! Jetzt noch folgende Schritte ausfuehren:
-             - einen Release für die GUI erstellen
+             - ein Release für die GUI erstellen
              - auf der Website (http://www.software-challenge.de/wp-admin) unter Medien die Dateien ersetzen
              - unter Seiten die Downloadseite aktualisieren (neue Version in Versionshistorie eintragen)
 
diff --git a/plugin/src/shared/sc/plugin2019/Board.java b/plugin/src/shared/sc/plugin2019/Board.java
deleted file mode 100644
index c305ebba5..000000000
--- a/plugin/src/shared/sc/plugin2019/Board.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package sc.plugin2019;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import sc.api.plugins.IBoard;
-import sc.plugin2019.util.Constants;
-import sc.shared.PlayerColor;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static sc.plugin2019.FieldState.OBSTRUCTED;
-
-/** Spielbrett für Piranhas mit {@link Constants#BOARD_SIZE}² Feldern. */
-@XStreamAlias(value = "board")
-public class Board implements IBoard {
-
-  @XStreamImplicit(itemFieldName = "fields")
-  private Field[][] fields;
-
-  public Board() {
-    this.fields = randomFields();
-  }
-
-  public Board(Board boardToClone) {
-    this.fields = emptyFields();
-    for(int x = 0; x < Constants.BOARD_SIZE; x++) {
-      for(int y = 0; y < Constants.BOARD_SIZE; y++) {
-        fields[x][y] = boardToClone.fields[x][y].clone();
-      }
-    }
-  }
-
-  @Override
-  public Board clone() {
-    return new Board(this);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof Board && Arrays.equals(((Board) obj).fields, this.fields);
-  }
-
-  private static Field[][] emptyFields() {
-   return new Field[Constants.BOARD_SIZE][Constants.BOARD_SIZE];
-  }
-
-  /** Erstellt eine zufälliges Spielbrett. */
-  private static Field[][] randomFields() {
-    Field[][] fields = emptyFields();
-    for(int x = 0; x < Constants.BOARD_SIZE; x++) {
-      for(int y = 0; y < Constants.BOARD_SIZE; y++) {
-        fields[x][y] = new Field(x, y);
-      }
-    }
-    // place piranhas
-    for(int index = 1; index < Constants.BOARD_SIZE - 1; index++) {
-      fields[0][index].setPiranha(PlayerColor.RED);
-      fields[Constants.BOARD_SIZE - 1][index].setPiranha(PlayerColor.RED);
-      fields[index][0].setPiranha(PlayerColor.BLUE);
-      fields[index][Constants.BOARD_SIZE - 1].setPiranha(PlayerColor.BLUE);
-    }
-    // place obstacles
-    // create a list of coordinates for fields which may be blocked
-    List<Field> blockableFields = new ArrayList<>();
-    for(int x = Constants.OBSTACLES_START; x < Constants.OBSTACLES_END; x++) {
-      blockableFields.addAll(Arrays.asList(fields[x]).subList(Constants.OBSTACLES_START, Constants.OBSTACLES_END));
-    }
-    // set fields with randomly selected coordinates to blocked
-    // coordinates may not lay on same horizontal, vertical or diagonal lines with other selected coordinates
-    for(int i = 0; i < Constants.NUM_OBSTACLES; i++) {
-      int indexOfFieldToBlock = (int) Math.floor(Math.random() * blockableFields.size());
-      Field selectedField = blockableFields.get(indexOfFieldToBlock);
-      selectedField.setState(OBSTRUCTED);
-      blockableFields = blockableFields.stream().filter(
-              field -> (!(field.getX() == selectedField.getX() ||
-                      field.getY() == selectedField.getY() ||
-                      field.getX() - field.getY() == selectedField.getX() - selectedField.getY() ||
-                      field.getX() + field.getY() == selectedField.getX() + selectedField.getY()))
-      ).collect(Collectors.toList());
-    }
-    return fields;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder b = new StringBuilder("Board {");
-    for(int x = 0; x < Constants.BOARD_SIZE; x++) {
-      for(int y = 0; y < Constants.BOARD_SIZE; y++) {
-        b.append(fields[x][y].getPiranha());
-      }
-    }
-    return b.append('}').toString();
-  }
-
-  public Field getField(int x, int y) {
-    return this.fields[x][y];
-  }
-
-}
-
diff --git a/plugin/src/shared/sc/plugin2019/Board.kt b/plugin/src/shared/sc/plugin2019/Board.kt
new file mode 100644
index 000000000..8550d3729
--- /dev/null
+++ b/plugin/src/shared/sc/plugin2019/Board.kt
@@ -0,0 +1,86 @@
+package sc.plugin2019
+
+import com.thoughtworks.xstream.annotations.XStreamAlias
+import com.thoughtworks.xstream.annotations.XStreamImplicit
+import sc.api.plugins.IBoard
+import sc.plugin2019.FieldState.OBSTRUCTED
+import sc.plugin2019.util.Constants
+import sc.shared.PlayerColor
+import java.util.*
+
+/** Spielbrett für Piranhas mit [Constants.BOARD_SIZE]² Feldern.  */
+@XStreamAlias(value = "board")
+class Board : IBoard {
+
+    @XStreamImplicit(itemFieldName = "fields")
+    private var fields: Array<Array<Field>>
+
+    constructor() {
+        this.fields = randomFields()
+    }
+
+    constructor(boardToClone: Board) {
+        this.fields = generateFields { x, y -> boardToClone.fields[x][y].clone() }
+    }
+
+    public override fun clone(): Board = Board(this)
+
+    override fun equals(other: Any?): Boolean = other is Board && Arrays.equals(other.fields, this.fields)
+
+    private fun generateFields(generator: (Int, Int) -> Field): Array<Array<Field>> {
+        return Array(Constants.BOARD_SIZE) { x ->
+            Array(Constants.BOARD_SIZE) { y ->
+                generator(x, y)
+            }
+        }
+    }
+
+    /** Erstellt eine zufälliges Spielbrett.  */
+    private fun randomFields(): Array<Array<Field>> {
+        val fields = generateFields { x, y -> Field(x, y) }
+
+        // Place Piranhas
+        for(index in 1 until Constants.BOARD_SIZE - 1) {
+            fields[0][index].setPiranha(PlayerColor.RED)
+            fields[Constants.BOARD_SIZE - 1][index].setPiranha(PlayerColor.RED)
+            fields[index][0].setPiranha(PlayerColor.BLUE)
+            fields[index][Constants.BOARD_SIZE - 1].setPiranha(PlayerColor.BLUE)
+        }
+
+        // Place Obstacles
+        // only consider fields in the middle of the board
+        var blockableFields: List<Field> = fields.slice(Constants.OBSTACLES_START..Constants.OBSTACLES_END).flatMap { it.slice(Constants.OBSTACLES_START..Constants.OBSTACLES_END) }
+        // set fields with randomly selected coordinates to blocked
+        // coordinates may not lay on same horizontal, vertical or diagonal lines with other selected coordinates
+        for(i in 0 until Constants.NUM_OBSTACLES) {
+            val indexOfFieldToBlock = Math.floor(Math.random() * blockableFields.size).toInt()
+            val selectedField = blockableFields[indexOfFieldToBlock]
+            selectedField.state = OBSTRUCTED
+            blockableFields = blockableFields.filter { field ->
+                !(field.x == selectedField.x || field.y == selectedField.y ||
+                        field.x - field.y == selectedField.x - selectedField.y ||
+                        field.x + field.y == selectedField.x + selectedField.y)
+            }
+        }
+        return fields
+    }
+
+    override fun toString() =
+            "Board " + fields.joinToString(" ", "[", "]") { column -> column.joinToString(", ", prefix = "[", postfix = "]") { it.toString() } }
+
+    val line = "-".repeat(Constants.BOARD_SIZE + 2)
+    fun prettyString(): String {
+        val map = Array(Constants.BOARD_SIZE) { StringBuilder("|") }
+        fields.forEach {
+            it.forEachIndexed { index, field ->
+                map[index].append(field.state.asLetter())
+            }
+        }
+        return map.joinToString("\n", line + "\n", "\n" + line) { it.append('|').toString() }
+    }
+
+    override fun getField(x: Int, y: Int): Field =
+            this.fields[x][y]
+
+}
+
diff --git a/plugin/src/shared/sc/plugin2019/Field.java b/plugin/src/shared/sc/plugin2019/Field.java
index fc2fd9ea3..caa0f7ce0 100644
--- a/plugin/src/shared/sc/plugin2019/Field.java
+++ b/plugin/src/shared/sc/plugin2019/Field.java
@@ -10,7 +10,7 @@
 import static sc.plugin2019.FieldState.*;
 
 /**
- * Ein Feld des Spielfelds. Ein Spielfeld hat eine x- und y-Koordinate und einen {@link FieldState}.
+ * Ein Feld des Spielfelds. Ein Spielfeld hat eine x- und y-Koordinate und einen {@link FieldState}, der anzeigt ob sich etwas auf diesem Feld befindet.
  */
 @XStreamAlias(value = "field")
 public class Field implements IField {
@@ -89,11 +89,7 @@ else if(state == BLUE)
     return Optional.empty();
   }
 
-  /**
-   * Nur für den Server (für Test) relevant.
-   *
-   * @param piranha Farbe des Piranhas
-   */
+  /** Nur für den Server relevant. */
   public void setPiranha(PlayerColor piranha) {
     state = FieldState.from(piranha);
   }
diff --git a/plugin/src/shared/sc/plugin2019/FieldState.java b/plugin/src/shared/sc/plugin2019/FieldState.java
deleted file mode 100644
index e071fb56c..000000000
--- a/plugin/src/shared/sc/plugin2019/FieldState.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package sc.plugin2019;
-
-import sc.shared.PlayerColor;
-
-import java.util.Objects;
-
-public enum FieldState {
-  RED,
-  BLUE,
-  OBSTRUCTED,
-  EMPTY;
-  public static FieldState from(PlayerColor color) {
-    switch(color) {
-      case RED: return RED;
-      case BLUE: return BLUE;
-      default: throw new IllegalArgumentException("PlayerColor can only be RED or BLUE");
-    }
-  }
-}
diff --git a/plugin/src/shared/sc/plugin2019/FieldState.kt b/plugin/src/shared/sc/plugin2019/FieldState.kt
new file mode 100644
index 000000000..742e03a81
--- /dev/null
+++ b/plugin/src/shared/sc/plugin2019/FieldState.kt
@@ -0,0 +1,34 @@
+package sc.plugin2019
+
+import sc.shared.PlayerColor
+
+enum class FieldState {
+    RED,
+    BLUE,
+    OBSTRUCTED,
+    EMPTY;
+
+    override fun toString() = when(this) {
+        OBSTRUCTED -> "Obstructed"
+        RED -> "Red"
+        BLUE -> "Blue"
+        else -> "empty"
+    }
+
+    fun asLetter() = when(this) {
+        OBSTRUCTED -> 'O'
+        RED -> 'R'
+        BLUE -> 'B'
+        else -> ' '
+    }
+
+    companion object {
+        @JvmStatic
+        fun from(color: PlayerColor): FieldState {
+            return when(color) {
+                PlayerColor.RED -> RED
+                PlayerColor.BLUE -> BLUE
+            }
+        }
+    }
+}
diff --git a/plugin/src/shared/sc/plugin2019/util/Constants.java b/plugin/src/shared/sc/plugin2019/util/Constants.java
index fd9d563a6..6ad4c29bb 100644
--- a/plugin/src/shared/sc/plugin2019/util/Constants.java
+++ b/plugin/src/shared/sc/plugin2019/util/Constants.java
@@ -10,13 +10,15 @@ public class Constants {
   public static final int GAME_STATS_SWARM_SIZE = 0;
   public static final int GAME_STATS_RED_INDEX = 0;
   public static final int GAME_STATS_BLUE_INDEX = 1;
-  public static final int WIN_SCORE = 2;
   public static final int LOSE_SCORE = 0;
   public static final int DRAW_SCORE = 1;
+  public static final int WIN_SCORE = 2;
 
   public static final int BOARD_SIZE = 10;
   public static final int NUM_OBSTACLES = 2;
   public static final int MAX_FISH = (BOARD_SIZE - 2) * 2;
-  public static final int OBSTACLES_START = 2; // refers to the lowest index at which a obstructed field might be placed
-  public static final int OBSTACLES_END = 7; // refers to the highest index at which a obstructed field might be placed
+  /** The lowest index at which a obstructed field may be placed */
+  public static final int OBSTACLES_START = 2;
+  /** The highest index at which a obstructed field may be placed */
+  public static final int OBSTACLES_END = 7;
 }
\ No newline at end of file
diff --git a/plugin/src/test/sc/plugin2019/GamePlayTest.java b/plugin/src/test/sc/plugin2019/GamePlayTest.java
index a638dea3b..ae1e0a95a 100644
--- a/plugin/src/test/sc/plugin2019/GamePlayTest.java
+++ b/plugin/src/test/sc/plugin2019/GamePlayTest.java
@@ -49,8 +49,7 @@ public void onlyEndAfterRoundTest() throws InvalidMoveException {
             "----R-O--R" +
             "------R--R" +
             "---------R" +
-            "----------"
-    );
+            "----------");
     state.setBoard(board);
     {
       Move move = new Move(9, 3, UP_LEFT);
@@ -76,8 +75,7 @@ public void fieldTest() {
             "R--------R" +
             "R--------R" +
             "R--------R" +
-            "-BBBBBBBB-"
-    );
+            "-BBBBBBBB-");
     state.setBoard(board);
     Field fieldRed = board.getField(0, 5);
     Field fieldEmpty = board.getField(5, 5);
@@ -116,12 +114,11 @@ public void testGreatestSwarm() {
             "R---------" +
             "R---------" +
             "----------" +
-            "-BBBBBBBB-"
-    );
+            "-BBBBBBBB-");
     state.setBoard(board);
 
     assertEquals(16, getOwnFields(board, PlayerColor.RED).size());
-    for (Field field : getOwnFields(board, PlayerColor.RED)) {
+    for(Field field : getOwnFields(board, PlayerColor.RED)) {
       assertEquals(RED, field.getState());
     }
 
@@ -135,27 +132,13 @@ public void testGreatestSwarm() {
             "R---------" +
             "R---------" +
             "----------" +
-            "----------"
-    );
+            "----------");
     state.setBoard(board);
     assertEquals(16, greatestSwarmSize(board, PlayerColor.BLUE));
-
-    board = TestGameUtil.createCustomBoard("" +
-            "BBBBBBBBBB" +
-            "-B-B--B---" +
-            "RO-B--B---" +
-            "R-O---B---" +
-            "R-RRRRRRRR" +
-            "R---------" +
-            "R---------" +
-            "R---------" +
-            "----------" +
-            "----------"
-    );
-    state.setBoard(board);
-    board.getField(1, 5).setState(EMPTY);
+    assertEquals(15, greatestSwarmSize(board, PlayerColor.RED));
+    board.getField(1, 4).setState(EMPTY);
+    assertEquals(16, greatestSwarmSize(board, PlayerColor.BLUE));
     assertEquals(8, greatestSwarmSize(board, PlayerColor.RED));
-
   }
 
   @Test
@@ -170,8 +153,7 @@ public void testValidMove() throws InvalidMoveException {
             "R--------R" +
             "R--------R" +
             "R--------R" +
-            "-BBBBBBBB-"
-    );
+            "-BBBBBBBB-");
     state.setBoard(board);
 
     assertTrue(isValidToMove(state, 0, 4, RIGHT, 2));
@@ -188,10 +170,10 @@ public void testValidMove() throws InvalidMoveException {
   public void testObstructedFieldGeneration() {
     int count = 0;
     List<Field> obstructedFields = new ArrayList<>();
-    for (int x = 0; x < Constants.BOARD_SIZE; x++) {
-      for (int y = 0; y < Constants.BOARD_SIZE; y++) {
-        if (state.getBoard().getField(x, y).isObstructed()) {
-          if (count < Constants.NUM_OBSTACLES) {
+    for(int x = 0; x < Constants.BOARD_SIZE; x++) {
+      for(int y = 0; y < Constants.BOARD_SIZE; y++) {
+        if(state.getBoard().getField(x, y).isObstructed()) {
+          if(count < Constants.NUM_OBSTACLES) {
             count++;
           } else {
             fail("More than two obstructed fields found");
@@ -200,7 +182,7 @@ public void testObstructedFieldGeneration() {
           assertTrue(y > 1);
           assertTrue(x < Constants.BOARD_SIZE - 2);
           assertTrue(y < Constants.BOARD_SIZE - 2);
-          for (Field field : obstructedFields) {
+          for(Field field : obstructedFields) {
             // check whether second field is in same line (diagonal, vertical or horizontal as first one)
             assertNotEquals(field.getX(), x); // horizontal
             assertNotEquals(field.getY(), y); // vertical
@@ -234,7 +216,7 @@ public void testNoWinAfterPiranhaEaten() throws InvalidMoveException {
     {
       Move move = new Move(1, 8, Direction.LEFT);
       move.perform(state);
-      assertEquals(null,  game.checkWinCondition());
+      assertEquals(null, game.checkWinCondition());
     }
 
     {
@@ -244,6 +226,6 @@ public void testNoWinAfterPiranhaEaten() throws InvalidMoveException {
     }
     assertEquals(5, GameRuleLogic.greatestSwarmSize(board, PlayerColor.BLUE));
     assertEquals(8, GameRuleLogic.greatestSwarmSize(board, PlayerColor.RED));
-    assertEquals(PlayerColor.BLUE, board.getField(2,2).getPiranha().get());
+    assertEquals(PlayerColor.BLUE, board.getField(2, 2).getPiranha().get());
   }
 }
diff --git a/plugin/src/test/sc/plugin2019/util/TestGameUtil.java b/plugin/src/test/sc/plugin2019/util/TestGameUtil.java
index 652743036..34d897278 100644
--- a/plugin/src/test/sc/plugin2019/util/TestGameUtil.java
+++ b/plugin/src/test/sc/plugin2019/util/TestGameUtil.java
@@ -1,23 +1,25 @@
 package sc.plugin2019.util;
 
+import org.junit.Assert;
 import sc.plugin2019.Board;
 import sc.plugin2019.FieldState;
 
 public class TestGameUtil {
 
   public static Board createCustomBoard(String boardString) {
-    if (boardString.length() != Constants.BOARD_SIZE * Constants.BOARD_SIZE) return null;
+    Assert.assertEquals("Length of boardString does not match size of the Board",
+            Constants.BOARD_SIZE * Constants.BOARD_SIZE, boardString.length());
 
     Board board = new Board();
-    for (int i = 0; i < Constants.BOARD_SIZE; i++) {
-      for (int j = 0; j < Constants.BOARD_SIZE; j++) {
+    for(int i = 0; i < Constants.BOARD_SIZE; i++) {
+      for(int j = 0; j < Constants.BOARD_SIZE; j++) {
         int index = i + j * Constants.BOARD_SIZE;
         char c = boardString.charAt(index);
-        if (c == 'R') {
+        if(c == 'R') {
           board.getField(i, j).setState(FieldState.RED);
-        } else if (c == 'B') {
+        } else if(c == 'B') {
           board.getField(i, j).setState(FieldState.BLUE);
-        } else if (c == 'O') {
+        } else if(c == 'O') {
           board.getField(i, j).setState(FieldState.OBSTRUCTED);
         } else {
           board.getField(i, j).setState(FieldState.EMPTY);
@@ -26,6 +28,6 @@ public static Board createCustomBoard(String boardString) {
     }
     return board;
   }
-  
+
 }
 
diff --git a/server/test/sc/protocol/requests/RequestTest.kt b/server/test/sc/protocol/requests/RequestTest.kt
index 93830c8b7..84bd1ab2b 100644
--- a/server/test/sc/protocol/requests/RequestTest.kt
+++ b/server/test/sc/protocol/requests/RequestTest.kt
@@ -318,7 +318,7 @@ class RequestTest : RealServerTest() {
         Assert.assertTrue(TestHelper.waitUntilTrue({ lobby.gameManager.games.isNotEmpty() }, 1000))
 
         player1.send(CancelRequest(listener.roomid))
-        Assert.assertTrue(TestHelper.waitUntilTrue({ lobby.gameManager.games.isEmpty() }, 1000))
+        Assert.assertTrue(TestHelper.waitUntilTrue({ lobby.gameManager.games.isEmpty() }, 3000))
         Assert.assertEquals(0, lobby.gameManager.games.size.toLong())
     }
 
@@ -359,8 +359,6 @@ class RequestTest : RealServerTest() {
         TestHelper.waitMillis(2000)
         room = gameMgr.games.iterator().next()
         Assert.assertFalse(room.slots[0].role.player.isCanTimeout)
-
-
     }
 
     @Test
diff --git a/socha-sdk/src/framework/sc/shared/PlayerColor.java b/socha-sdk/src/framework/sc/shared/PlayerColor.java
deleted file mode 100644
index bc42cfac8..000000000
--- a/socha-sdk/src/framework/sc/shared/PlayerColor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package sc.shared;
-
-public enum PlayerColor {
-
-  RED, BLUE;
-
-  /**
-   * liefert die Spielerfarbe des Gegners dieses Spielers
-   * @return Spielerfarbe des Gegners
-   */
-  public PlayerColor opponent() {
-    return this == RED ? BLUE : RED;
-  }
-
-}
diff --git a/socha-sdk/src/framework/sc/shared/PlayerColor.kt b/socha-sdk/src/framework/sc/shared/PlayerColor.kt
new file mode 100644
index 000000000..7e36bd88a
--- /dev/null
+++ b/socha-sdk/src/framework/sc/shared/PlayerColor.kt
@@ -0,0 +1,15 @@
+package sc.shared
+
+enum class PlayerColor {
+
+    RED, BLUE;
+
+    /**
+     * liefert die Spielerfarbe des Gegners dieses Spielers
+     * @return Spielerfarbe des Gegners
+     */
+    fun opponent(): PlayerColor = if(this == RED) BLUE else RED
+
+    fun asLetter(): String = if(this == RED) "R" else "B"
+
+}
diff --git a/socha-sdk/src/server-api/sc/api/plugins/IGameState.kt b/socha-sdk/src/server-api/sc/api/plugins/IGameState.kt
index f1d1b3e5f..706dc485d 100644
--- a/socha-sdk/src/server-api/sc/api/plugins/IGameState.kt
+++ b/socha-sdk/src/server-api/sc/api/plugins/IGameState.kt
@@ -25,7 +25,7 @@ import sc.protocol.responses.ProtocolMessage
  *
  * @author Niklas, Sören, Janek
  */
-interface IGameState : ProtocolMessage {
+interface IGameState : ProtocolMessage, Cloneable {
     /** Aktuelle Zugzahl  */
     val turn: Int
 
diff --git a/socha-sdk/src/server-api/sc/api/plugins/TwoPlayerGameState.kt b/socha-sdk/src/server-api/sc/api/plugins/TwoPlayerGameState.kt
index 003359ec4..fe9d6341f 100644
--- a/socha-sdk/src/server-api/sc/api/plugins/TwoPlayerGameState.kt
+++ b/socha-sdk/src/server-api/sc/api/plugins/TwoPlayerGameState.kt
@@ -61,9 +61,6 @@ abstract class TwoPlayerGameState<P : Player, M : IMove> : IGameState {
     abstract fun getPointsForPlayer(playerColor: PlayerColor): Int
 
     override fun toString() =
-            ("GameState{turn=" + turn + ",currentPlayer=" + currentPlayer + "}"
-                    + red + blue
-                    + board
-                    + lastMove)
+            "GameState(turn=$turn,currentPlayer=${currentPlayer.color})"
 
 }
\ No newline at end of file
diff --git a/socha-sdk/src/server-api/sc/framework/plugins/Player.kt b/socha-sdk/src/server-api/sc/framework/plugins/Player.kt
index b96db5590..32f6b9b8c 100644
--- a/socha-sdk/src/server-api/sc/framework/plugins/Player.kt
+++ b/socha-sdk/src/server-api/sc/framework/plugins/Player.kt
@@ -74,6 +74,6 @@ open class Player(@XStreamAsAttribute var color: PlayerColor) : Cloneable {
         logger.debug("Move requested from $this")
     }
 
-    override fun toString(): String = "%s Player - %s".format(color, displayName)
+    override fun toString(): String = "Player %s(%s)".format(color, displayName)
 
 }