diff --git a/.DS_Store b/.DS_Store
index ca7d508..0686c38 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift b/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift
index d4f16e5..b585ec1 100644
--- a/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift
+++ b/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift
@@ -8,76 +8,100 @@
 import Foundation
 import SpriteKit
 import DouShouQiModel
+
+class GameScene: SKScene {
+    var isGameOver = false
+    let imageBoard: SKSpriteNode = SKSpriteNode(imageNamed: "board")
+    var game: Game = try! Game(withRules: ClassicRules(), andPlayer1: HumanPlayer(withName: "Bot1", andId: .player1)!, andPlayer2: RandomPlayer(withName: "Bot2", andId: .player2)!)
     
-    class GameScene: SKScene {
-        var isGameOver = false
-        let imageBoard: SKSpriteNode = SKSpriteNode(imageNamed: "board")
-        var game: Game = try! Game(withRules: ClassicRules(), andPlayer1: HumanPlayer(withName: "Bot1", andId: .player1)!, andPlayer2: RandomPlayer(withName: "Bot2", andId: .player2)!)
-        
-        var player1Name: String
-        var player1Image: UIImage
-        var player2Name: String
-        var player2Image: UIImage
-        
-        var pieces: [Owner: [Animal: SpriteMoople]] = [
-            .player1: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .red),
-                       .dog: SpriteMoople(nameImage: "dogMeeple", couleur: .red),
-                       .leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .red),
-                       .lion: SpriteMoople(nameImage: "lionMeeple", couleur: .red),
-                       .rat: SpriteMoople(nameImage: "ratMeeple", couleur: .red),
-                       .wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .red),
-                       .elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .red),
-                       .tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .red)],
-            .player2: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .blue),
-                       .dog: SpriteMoople(nameImage: "dogMeeple", couleur: .blue),
-                       .leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .blue),
-                       .lion: SpriteMoople(nameImage: "lionMeeple", couleur: .blue),
-                       .rat: SpriteMoople(nameImage: "ratMeeple", couleur: .blue),
-                       .wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .blue),
-                       .elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .blue),
-                       .tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .blue)]
-        ]
-        
-        var deplacementPossible: [SKShapeNode] = []
+    var player1Name: String
+    var player1Image: UIImage
+    var player2Name: String
+    var player2Image: UIImage
+
+    var pieces: [Owner: [Animal: SpriteMoople]] = [
+        .player1: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .red),
+                   .dog: SpriteMoople(nameImage: "dogMeeple", couleur: .red),
+                   .leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .red),
+                   .lion: SpriteMoople(nameImage: "lionMeeple", couleur: .red),
+                   .rat: SpriteMoople(nameImage: "ratMeeple", couleur: .red),
+                   .wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .red),
+                   .elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .red),
+                   .tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .red)],
+        .player2: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .blue),
+                   .dog: SpriteMoople(nameImage: "dogMeeple", couleur: .blue),
+                   .leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .blue),
+                   .lion: SpriteMoople(nameImage: "lionMeeple", couleur: .blue),
+                   .rat: SpriteMoople(nameImage: "ratMeeple", couleur: .blue),
+                   .wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .blue),
+                   .elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .blue),
+                   .tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .blue)]
+    ]
+
+    var deplacementPossible: [SKShapeNode] = []
+
+    required init?(coder aDecoder: NSCoder) {
+        self.player1Name = ""
+        self.player1Image = UIImage()
+        self.player2Name = ""
+        self.player2Image = UIImage()
+        super.init(coder: aDecoder)
+    }
+
+    override init(size: CGSize) {
+        self.player1Name = ""
+        self.player1Image = UIImage()
+        self.player2Name = ""
+        self.player2Image = UIImage()
+        super.init(size: size)
+        // --  -- //
+        scaleMode = .aspectFit
+        anchorPoint = CGPoint(x: 0.5, y: 0.5)
+        imageBoard.zPosition = 0
+        self.addChild(imageBoard)
+        // --  -- //
         
-        init(size: CGSize, player1Name: String, player1Image: UIImage, player2Name: String, player2Image: UIImage) {
-            self.player1Name = player1Name
-            self.player1Image = player1Image
-            self.player2Name = player2Name
-            self.player2Image = player2Image
-            super.init(size: size)
-            
-            scaleMode = .aspectFit
-            anchorPoint = CGPoint(x: 0.5, y: 0.5)
-            imageBoard.zPosition = 0
-            self.addChild(imageBoard)
-            
-            for c in pieces.flatMap({ $0.value }) {
-                c.value.refGameScene = self
-                c.value.zPosition = 2
-                self.addChild(c.value)
-            }
-            
-            displayBoard(board: game.board)
+        for c in pieces.flatMap({ _,values in return values })
+        {
+            c.self.value.refGameScene = self
+            c.self.value.zPosition = 2
+            self.addChild(c.self.value)
         }
         
-        required init?(coder aDecoder: NSCoder) {
-            self.player1Name = ""
-            self.player1Image = UIImage()
-            self.player2Name = ""
-            self.player2Image = UIImage()
-            super.init(coder: aDecoder)
-        }
+        displayBoard(board: game.board)
         
-        func displayBoard(board: Board) {
-            for ligne in 0..<board.grid.count {
-                for col in 0..<board.grid[ligne].count {
-                    if let piece = board.grid[ligne][col].piece {
-                        if let element = pieces[piece.owner]?[piece.animal] {
-                            element.cellPosition = CGPoint(x: ligne, y: col)
-                        }
+    }
+
+    init(size: CGSize, player1Name: String, player1Image: UIImage, player2Name: String, player2Image: UIImage) {
+        self.player1Name = player1Name
+        self.player1Image = player1Image
+        self.player2Name = player2Name
+        self.player2Image = player2Image
+        super.init(size: size)
+
+        scaleMode = .aspectFit
+        anchorPoint = CGPoint(x: 0.5, y: 0.5)
+        imageBoard.zPosition = 0
+        self.addChild(imageBoard)
+
+        for c in pieces.flatMap({ $0.value }) {
+            c.value.refGameScene = self
+            c.value.zPosition = 2
+            self.addChild(c.value)
+        }
+
+        displayBoard(board: game.board)
+    }
+
+    func displayBoard(board: Board) {
+        for ligne in 0..<board.grid.count {
+            for col in 0..<board.grid[ligne].count {
+                if let piece = board.grid[ligne][col].piece {
+                    if let element = pieces[piece.owner]?[piece.animal] {
+                        element.cellPosition = CGPoint(x: ligne, y: col)
                     }
                 }
             }
         }
     }
+}
diff --git a/ArkitDoushiQi/ArkitDoushiQi/Game/GameView.swift b/ArkitDoushiQi/ArkitDoushiQi/Game/GameView.swift
index f790f30..7c78821 100644
--- a/ArkitDoushiQi/ArkitDoushiQi/Game/GameView.swift
+++ b/ArkitDoushiQi/ArkitDoushiQi/Game/GameView.swift
@@ -24,31 +24,36 @@ struct GameView: View {
         return scene
     }
 
-    @State var msg: String = "Msg"
+    @State var msg: String = ""
 
     var body: some View {
         ZStack {
+            Text(msg)
             SpriteView(scene: gameScene)
                 .edgesIgnoringSafeArea(.all)
                 .task {
                     gameScene.game.addGameStartedListener { board in startGame() }
-                    gameScene.game.addGameOverListener { board, result, player in gameOver(result: result) }
+                    gameScene.game.addGameOverListener { board, result, player in gameOver(result : result) }
                     gameScene.game.addGameChangedListener { game in gameChange() }
                     gameScene.game.addBoardChangedListener { board in boardChange() }
+
                     gameScene.game.addMoveChosenCallbacksListener { board, move, player in moveChose(board: board, move: move, player: player) }
                     gameScene.game.addInvalidMoveCallbacksListener { board, move, player, bool in invalidMove(board: board, move: move, player: player, bool: bool) }
+
                     gameScene.game.addPieceRemovedListener { _, _, piece in removePiece(piece: piece) }
+
                     gameScene.game.addPlayerNotifiedListener { board, player in
                         print("Player notif : \(player.id) à toi de jouer ")
                         msg = "Player notif : \(player.id) à toi de jouer !"
-                        
+
                         if player is IAPlayer {
                             try! await player.chooseMove(in: board, with: gameScene.game.rules)
                         }
                     }
+
                     try! await gameScene.game.start()
                 }
-            
+
             VStack {
                 HStack {
                     VStack {
@@ -58,7 +63,7 @@ struct GameView: View {
                             .frame(width: 125, height: 125)
                             .clipShape(Circle())
                             .overlay(Circle().stroke(Color.red, lineWidth: 2))
-                        
+
                         Text(player1Name)
                             .font(.headline)
                             .foregroundColor(.white)
@@ -71,7 +76,7 @@ struct GameView: View {
                             .frame(width: 125, height: 125)
                             .clipShape(Circle())
                             .overlay(Circle().stroke(Color.blue, lineWidth: 2))
-                        
+
                         Text(player2Name)
                             .font(.headline)
                             .foregroundColor(.white)
@@ -86,46 +91,47 @@ struct GameView: View {
             }
         }
     }
-    
-    // ------ Listener Methods -------- //
-    
+
+    // ------ Listener -------- //
+
     func startGame() {
         print("Start game !")
         msg = "Start !!"
     }
-    
-    func gameOver(result: Result) {
-        print("Game over !")
+
+    func gameOver(result : Result) { print("Game over !")
         msg = "Game over ! "
-        switch result {
+        switch result
+        {
         case .winner(let winner, _):
             switch winner {
             case .player1:
-                msg += "player 1 wins !"
+                msg = msg + "player 1 wins !"
             case .player2:
-                msg += "player 2 wins !"
+                msg = msg + "player 2 wins !"
             default:
-                msg += "equality !"
+                msg = msg + "equality !"
             }
         default:
-            msg = "Game over !"
+            msg="Game over !"
         }
         
         gameScene.isGameOver = true
-        actionEndGame(scene: gameScene, message: msg)
+        actionEndGame(scene: gameScene,message: msg)
     }
-    
+
     func gameChange() {
         print("Game change !")
     }
-    
+
     func boardChange() {
         print("Board change !")
         gameScene.displayBoard(board: gameScene.game.board)
     }
-    
-    func moveChose(board: Board, move: Move, player: Player) {}
-    
+
+    func moveChose(board: Board, move: Move, player: Player) {
+    }
+
     func invalidMove(board: Board, move: Move, player: Player, bool: Bool) {
         if bool {
             print("Move valid de \(player.id)")
@@ -137,16 +143,16 @@ struct GameView: View {
         }
         print("------------")
     }
-    
-    func removePiece(piece: Piece) {
+
+    func removePiece(piece:Piece){
         print("Remove piece")
-        if let node = gameScene.pieces[piece.owner]?[piece.animal] {
+        if let node = gameScene.pieces[piece.owner]![piece.animal] {
             actionRemove(size: gameScene.size, node: node, scene: gameScene)
-            if let node = gameScene.pieces[piece.owner]?[piece.animal] {
-                print("Remove piece from parent")
-            }
+            print("Remove piece from parent")
         }
     }
+
+    // ------------------------- //
 }
 
 struct GameView_Previews: PreviewProvider {