diff --git a/src/keyer.cpp b/src/keyer.cpp
index 5e06b7b..5fd8f19 100644
--- a/src/keyer.cpp
+++ b/src/keyer.cpp
@@ -51,7 +51,7 @@ void Keyer::setSpeed(uint8_t wpm)
 void Keyer::sendMessage(std::string msg)
 {
     std::string morse = messageToMorse(msg);
-    printf("Morse (%i): %s\n", morse.length(), morse.c_str());
+
     for (unsigned char c : morse) {
         m_messageQueue.push(c);
     }
@@ -80,8 +80,6 @@ void Keyer::run()
             m_messageChar = m_messageQueue.front();
             m_messageQueue.pop();
 
-            printf("Char is: %c\n", m_messageChar);
-
             switch (m_messageChar) {
             case '.':
                 m_messageKeyingState = MessageState::Dit;
diff --git a/src/morse.cpp b/src/morse.cpp
index 42f79bb..8dac9f2 100644
--- a/src/morse.cpp
+++ b/src/morse.cpp
@@ -4,97 +4,82 @@
 
 #include "morse.h"
 
-std::map<char, std::string> morseCode = {
-    {'A', ".-"},     {'B', "-..."},    {'C', "-.-."},   {'D', "-.."},    {'E', "."},      {'F', "..-."},
-    {'G', "--."},    {'H', "...."},    {'I', ".."},     {'J', ".---"},   {'K', "-.-"},    {'L', ".-.."},
-    {'M', "--"},     {'N', "-."},      {'O', "---"},    {'P', ".--."},   {'Q', "--.-"},   {'R', ".-."},
-    {'S', "..."},    {'T', "-"},       {'U', "..-"},    {'V', "...-"},   {'W', ".--"},    {'X', "-..-"},
-    {'Y', "-.--"},   {'Z', "--.."},    {'1', ".----"},  {'2', "..---"},  {'3', "...--"},  {'4', "....-"},
-    {'5', "....."},  {'6', "-...."},   {'7', "--..."},  {'8', "---.."},  {'9', "----."},  {'0', "-----"},
-    {',', "--..--"}, {'.', ".-.-.-"},  {'?', "..--.."}, {'/', "-..-."},  {'-', "-....-"}, {':', "---..."},
-    {'&', ".-..."},  {'\'', ".----."}, {'@', ".--.-."}, {')', "-.--.-"}, {'(', "-.--."},  {'\"', ".-..-."},
-    {'=', "-...-"},  // '=' == <BT>
-    {'k', "-.--."},  // k == <KN>
-    {'s', "...-.-"}, // s == <SK>
-    {'+', ".-.-."},  // + == <AR>
-    {'a', "-.-.-"},  // a == <KA>
+static std::map<char, std::string> morseCode = {
+    {'A', ".-"},      {'B', "-..."},    {'C', "-.-."},   {'D', "-.."},    {'E', "."},      {'F', "..-."},
+    {'G', "--."},     {'H', "...."},    {'I', ".."},     {'J', ".---"},   {'K', "-.-"},    {'L', ".-.."},
+    {'M', "--"},      {'N', "-."},      {'O', "---"},    {'P', ".--."},   {'Q', "--.-"},   {'R', ".-."},
+    {'S', "..."},     {'T', "-"},       {'U', "..-"},    {'V', "...-"},   {'W', ".--"},    {'X', "-..-"},
+    {'Y', "-.--"},    {'Z', "--.."},    {'1', ".----"},  {'2', "..---"},  {'3', "...--"},  {'4', "....-"},
+    {'5', "....."},   {'6', "-...."},   {'7', "--..."},  {'8', "---.."},  {'9', "----."},  {'0', "-----"},
+    {',', "--..--"},  {'.', ".-.-.-"},  {'?', "..--.."}, {'/', "-..-."},  {'-', "-....-"}, {':', "---..."},
+    {'&', ".-..."},   {'\'', ".----."}, {'@', ".--.-."}, {')', "-.--.-"}, {'(', "-.--."},  {'\"', ".-..-."},
+    {'=', "-...-"},   // '=' == <BT>
+    {'b', "-...-.-"}, // '=' == <BK>
+    {'k', "-.--."},   // k == <KN>
+    {'s', "...-.-"},  // s == <SK>
+    {'+', ".-.-."},   // + == <AR>
+    {'a', "-.-.-"},   // a == <KA>
 };
 
 void refurbishMessage(std::string &msg)
 {
-    printf("The message is: %s\n", msg.c_str());
-    //std::string msgRefurb;
-    //msgRefurb.resize(msg.size());
-
     // Make the message all upper case
-    //std::transform(msg.begin(), msg.end(), msgRefurb.begin(), [](unsigned char c) { return std::toupper(c); });
     std::transform(msg.begin(), msg.end(), msg.begin(), ::toupper);
 
-
     // Encode the special characters as we like it
-    //msg = std::regex_replace(msg, std::regex("<BT>"), "=");
-    //msg = std::regex_replace(msg, std::regex("<KN>"), "k");
-    //msg = std::regex_replace(msg, std::regex("<SK>"), "s");
-    //msg = std::regex_replace(msg, std::regex("<AR>"), "+");
-    //msg = std::regex_replace(msg, std::regex("<KA>"), "a");
-
-    //printf("Msg Origgg: %s\n", msg.c_str());
+    msg = std::regex_replace(msg, std::regex("<BT>"), "=");
+    msg = std::regex_replace(msg, std::regex("<BK>"), "b");
+    msg = std::regex_replace(msg, std::regex("<KN>"), "k");
+    msg = std::regex_replace(msg, std::regex("<SK>"), "s");
+    msg = std::regex_replace(msg, std::regex("<AR>"), "+");
+    msg = std::regex_replace(msg, std::regex("<KA>"), "a");
 
     // Remove all other unknown characters
-    //msg.erase(remove_if(msg.begin(), msg.end(),
-    //                          [](const char &c) { return c != ' ' && morseCode.find(c) == morseCode.end(); }),
-    //                msg.end());
+    msg.erase(remove_if(msg.begin(), msg.end(),
+                        [](const char &c) { return c != ' ' && morseCode.find(c) == morseCode.end(); }),
+              msg.end());
 
     // Remove spaces, if there are too many of them
-    //msg = std::regex_replace(msg, std::regex("(\\s+)"), " ");
-
-    //printf("Msg Origgg2: %s\n", msg.c_str());
-    //return msgRefurb;
+    msg = std::regex_replace(msg, std::regex("(\\s+)"), " ");
 }
 
 std::string messageToMorse(std::string &msg)
 {
     refurbishMessage(msg);
-    
-    std::string morseString = "";
 
-    printf("Ref Mesg (%i): %s\n", msg.length(), msg.c_str());
+    std::string morseString {};
 
     for (unsigned int i = 0; i < msg.length(); i++) {
         char c = msg[i];
         if (c == ' ') {
-            morseString += 'w';
+            morseString.push_back('w');
             continue;
         }
 
         // Ignore and continue with next char, if not found
         auto search = morseCode.find(c);
         if (search == morseCode.end()) {
-            printf("Nanu (i=%i)? %c\n", i, c);
             continue;
         }
 
         for (unsigned int j = 0; j < morseCode[c].length(); j++) {
-            char  m = morseCode[c][j]; printf("M = %c\n", m);
+            char m = morseCode[c][j];
             if (j == 0 && i > 0 && msg[i - 1] != ' ') {
-                morseString += 'c';
+                morseString.push_back('c');
             }
 
             morseString += m;
 
             if (j < morseCode[c].length() - 1) {
-                morseString += 'i';
+                morseString.push_back('i');
             }
         }
     }
 
     // Append word space if last char was not a blank
     if (msg.back() != ' ') {
-        morseString += 'w';
+        morseString.push_back('w');
     }
 
-    printf("Sodele: %s\n", morseString.c_str());
-    printf("Ref Mesg 2 (%i): %s\n", msg.length(), msg.c_str());
-
     return morseString;
 }
\ No newline at end of file
diff --git a/src/raspi_keyer.cpp b/src/raspi_keyer.cpp
index d9edd22..b6fab46 100644
--- a/src/raspi_keyer.cpp
+++ b/src/raspi_keyer.cpp
@@ -207,7 +207,7 @@ int main()
         busy_wait_ms(5000);
         if (!used) {
             //KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, settings.mode, "cq cq de dg2smb dg2smb pse k"};
-            KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, settings.mode, "cq cqde dg2smbk"};            
+            KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, settings.mode, "cq cq de dg2smb dg2smb pse k"};
             queue_add_blocking(&keyerQueue, &keyerQueueData);
             used = true;
         }