diff --git a/src/keyer.cpp b/src/keyer.cpp
index 5e06b7b..e21abbc 100644
--- a/src/keyer.cpp
+++ b/src/keyer.cpp
@@ -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..3b9fa8b 100644
--- a/src/morse.cpp
+++ b/src/morse.cpp
@@ -4,7 +4,7 @@
 
 #include "morse.h"
 
-std::map<char, std::string> morseCode = {
+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', ".-."},
@@ -23,47 +23,40 @@ std::map<char, std::string> morseCode = {
 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("<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+)"), " ");
+    msg = std::regex_replace(msg, std::regex("(\\s+)"), " ");
 
-    //printf("Msg Origgg2: %s\n", msg.c_str());
-    //return msgRefurb;
+    printf("The message is now: %s\n", msg.c_str());
 }
 
 std::string messageToMorse(std::string &msg)
 {
     refurbishMessage(msg);
     
-    std::string morseString = "";
+    std::string morseString {};
 
     printf("Ref Mesg (%i): %s\n", msg.length(), msg.c_str());
 
     for (unsigned int i = 0; i < msg.length(); i++) {
         char c = msg[i];
         if (c == ' ') {
-            morseString += 'w';
+            morseString.push_back('w');
             continue;
         }
 
@@ -75,25 +68,25 @@ std::string messageToMorse(std::string &msg)
         }
 
         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("Morse String: %s\n", morseString.c_str());
     printf("Ref Mesg 2 (%i): %s\n", msg.length(), msg.c_str());
 
     return morseString;