diff --git a/src/command_line_interface.cpp b/src/command_line_interface.cpp
index 12d5958..261a368 100644
--- a/src/command_line_interface.cpp
+++ b/src/command_line_interface.cpp
@@ -136,6 +136,7 @@ namespace Hanabi
           print_probability(std::cout, probability) << std::endl;
         }
       }
+      quiet_os << "Enumerated " << game.state->position_tablebase().size() << " states." << std::endl;
       return EXIT_SUCCESS;
     }
 
@@ -194,7 +195,7 @@ namespace Hanabi
     }
     else
     {
-      quiet_os << "Analysing state: \n\n" << *game.state << "\n" << std::endl;
+      quiet_os << "\nAnalysing state...\n" << std::endl;
       auto const start = std::chrono::high_resolution_clock::now();
       probability_t const result = game.state->evaluate_state();
       auto const end = std::chrono::high_resolution_clock::now();
diff --git a/src/hanabi_types.cpp b/src/hanabi_types.cpp
index 70bff7a..10b298b 100644
--- a/src/hanabi_types.cpp
+++ b/src/hanabi_types.cpp
@@ -10,11 +10,7 @@ namespace Hanabi
         os << "play " + to_string(action.card);
         break;
       case ActionType::discard:
-        os << "discard";
-        if (action.card != Cards::trash)
-        {
-          os << " " + to_string(action.card);
-        }
+        os << "discard " + to_string(action.card);
         break;
       case ActionType::clue:
         os << "clue";