diff --git a/src/schack/Bishop.java b/src/schack/Bishop.java
index eba0aed..099b758 100644
--- a/src/schack/Bishop.java
+++ b/src/schack/Bishop.java
@@ -14,14 +14,10 @@ public class Bishop extends LongWalkers {
     @Override
     public ArrayList<Point> validMoves(Piece[][] pieces, boolean isSelected) {
         return getMoves(
-                new int[][]{{-1,-1},{1, 1}, {-1, 1}, {1, -1}},
+                new int[][]{{-1, -1}, {1, 1}, {-1, 1}, {1, -1}},
                 pieces,
                 isSelected
         );
     }
 
-    @Override
-    public String toString() {
-        return "Bishop{" + "position=" + position + ", isWhite=" + white + '}';
-    }
 }
diff --git a/src/schack/King.java b/src/schack/King.java
index c053bbd..25fff9e 100644
--- a/src/schack/King.java
+++ b/src/schack/King.java
@@ -99,7 +99,7 @@ public final class King extends PieceKnownIfMoved {
                 if (loopY == 0 && loopX == 0) {
                     continue;
                 }
-                addMovesIfCan(new Point(this.position.x + loopX, this.position.y + loopY), movable, pieces,  isSelected);
+                addMovesIfCan(new Point(this.position.x + loopX, this.position.y + loopY), movable, pieces, isSelected);
             }
 
         }
@@ -107,9 +107,4 @@ public final class King extends PieceKnownIfMoved {
         return movable;
     }
 
-    @Override
-    public String toString() {
-        return "Piece{" + "hasMoved=" + moved + "position=" + position + ", isWhite=" + white + '}';
-    }
-
 }
diff --git a/src/schack/Pawn.java b/src/schack/Pawn.java
index 5fe143c..7028f94 100644
--- a/src/schack/Pawn.java
+++ b/src/schack/Pawn.java
@@ -107,8 +107,4 @@ public class Pawn extends PieceKnownIfMoved {
 
     }
 
-    @Override
-    public String toString() {
-        return "Pawn{" + "position=" + position + ", isWhite=" + white + '}';
-    }
 }
diff --git a/src/schack/Piece.java b/src/schack/Piece.java
index b98a968..15161e7 100644
--- a/src/schack/Piece.java
+++ b/src/schack/Piece.java
@@ -164,7 +164,8 @@ public abstract class Piece {
 
     @Override
     public String toString() {
-        return "Piece{" + "position=" + position + ", isWhite=" + white + '}';
+        return this.getClass().getSimpleName() + "{" + "position=" + position + ", isWhite=" + white + '}';
+//        return "Piece{" + "position=" + position + ", isWhite=" + white + '}';
     }
 
     public boolean isWhite() {
diff --git a/src/schack/Schack.java b/src/schack/Schack.java
index 2b302e3..c6e10b3 100644
--- a/src/schack/Schack.java
+++ b/src/schack/Schack.java
@@ -23,7 +23,7 @@ public class Schack {
         // Set theme
         try {
 //            FlatSolarizedLightIJTheme.setup();
-            //FlatLightLaf.setup();
+//            FlatLightLaf.setup();
             //embedMenuBarIfSupported();
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         } catch (Exception cantThemeWithFlatLaf) {