diff --git a/cpp/src/controller/ai_vs_ai.cpp b/cpp/src/controller/ai_vs_ai.cpp
index bad15fd..da8eae1 100644
--- a/cpp/src/controller/ai_vs_ai.cpp
+++ b/cpp/src/controller/ai_vs_ai.cpp
@@ -25,7 +25,6 @@ void AIvsAIController::start() {
 void AIvsAIController::make_move(Move move) {
     board = board.make_move(move);
     std::cout << "Made move: " << move << std::endl;
-    exit(0);
     view.update_board(board, -1, {});
 
     Colour current_colour = board.white_to_play ? White : Black;
diff --git a/cpp/src/controller/manual.cpp b/cpp/src/controller/manual.cpp
index 0f714b4..0db5a8e 100644
--- a/cpp/src/controller/manual.cpp
+++ b/cpp/src/controller/manual.cpp
@@ -54,11 +54,12 @@ void ManualController::make_move(Move move) {
     // handle promotion before making the move
     Colour colour = board.white_to_play ? White : Black;
     Coords source = Coords::from_index(move.source_square);
-    Piece promotion_piece = Piece::None;
     if (board.piece_at(move.source_square) == Piece::Pawn
-        && board.colour_at(move.source_square) == White && source.y == 6)
-        promotion_piece = (Piece) (colour | view.ask_about_promotion());
-    move.promoting_to = promotion_piece;
+        && board.colour_at(move.source_square) == White && source.y == 6) {
+        Piece promotion_piece = (Piece) (colour | view.ask_about_promotion());
+        move.promoting_to = promotion_piece;
+    }
+
     board = board.make_move(move);
     reset_selection();