diff --git a/src/atcore.h b/src/atcore.h
--- a/src/atcore.h
+++ b/src/atcore.h
@@ -295,7 +295,7 @@
      * @brief Set extruder temperature
      * @param temp : new temperature
      * @param extruder : extruder number
-     * @param andWait: True for heat and ignore commands untill temperature is reached
+     * @param andWait: True for heat and ignore commands until temperature is reached
      */
     void setExtruderTemp(uint temp = 0, uint extruder = 0, bool andWait = false);
 
@@ -310,7 +310,7 @@
     /**
      * @brief Set the bed temperature
      * @param temp : new temperature
-     * @param andWait: True for heat and ignore commands untill temperature is reached
+     * @param andWait: True for heat and ignore commands until temperature is reached
      * @sa setExtruderTemp()
      */
     void setBedTemp(uint temp = 0, bool andWait = false);
diff --git a/src/gcodecommands.cpp b/src/gcodecommands.cpp
--- a/src/gcodecommands.cpp
+++ b/src/gcodecommands.cpp
@@ -92,23 +92,20 @@
     case G0: {
         if (value1.isEmpty()) {
             return QStringLiteral("G0");
-        } else {
-            return QStringLiteral("G0 %1").arg(value1.toUpper());
         }
+        return QStringLiteral("G0 %1").arg(value1.toUpper());
     }
     case G1: {
         if (value1.isEmpty()) {
             return QStringLiteral("G1");
-        } else {
-            return QStringLiteral("G1 %1").arg(value1.toUpper());
         }
+        return QStringLiteral("G1 %1").arg(value1.toUpper());
     }
     case G28: {
         if (value1.isEmpty()) {
             return QStringLiteral("G28");
-        } else {
-            return QStringLiteral("G28 %1").arg(value1.toUpper());
         }
+        return QStringLiteral("G28 %1").arg(value1.toUpper());
     }
     case G32:
         return QStringLiteral("G32 S1");
@@ -118,7 +115,6 @@
         return QStringLiteral("G91");
     default:
         return QObject::tr("Not implemented or not supported!");
-
     }
 }
 
@@ -507,42 +503,41 @@
 
 QString GCode::toCommand(MCommands gcode, const QString &value1, const QString &value2)
 {
-
     switch (gcode) {
     case M84: {
         if (!value1.isEmpty()) {
             return QStringLiteral("M84 S%1").arg(value1);
         }
         return QStringLiteral("M84");
     }
     case M104: {
-        if (!value2.isEmpty()) {
+        if (!value2.isEmpty() && !value1.isEmpty()) {
             return QStringLiteral("M104 P%1 S%2").arg(value1).arg(value2);
-        } else if (!value1.isEmpty()) {
+        }
+        if (!value1.isEmpty()) {
             return QStringLiteral("M104 S%1").arg(value1);
-        } else {
-            return QObject::tr("ERROR! M104: It's obligatory to have an argument");
         }
+        return QObject::tr("ERROR! M104: It's obligatory to have an argument");
     }
     case M105:
         return QStringLiteral("M105");
     case M106: {
-        if (!value2.isEmpty()) {
+        if (!value2.isEmpty() && !value1.isEmpty()) {
             return QStringLiteral("M106 P%1 S%2").arg(value1).arg(value2);
-        } else if (!value1.isEmpty()) {
+        }
+        if (!value1.isEmpty()) {
             return QStringLiteral("M106 S%1").arg(value1);
-        } else {
-            return QStringLiteral("M106");
         }
+        return QStringLiteral("M106");
     }
     case M107:
         return QStringLiteral("M107");
-    case M109:
+    case M109: {
         if (!value1.isEmpty()) {
             return QStringLiteral("M109 S%1").arg(value1);
-        } else {
-            return QObject::tr("ERROR! M109: It's obligatory to have an argument");
         }
+        return QObject::tr("ERROR! M109: It's obligatory to have an argument");
+    }
     case M112:
         return QStringLiteral("M112");
     case M114:
@@ -554,42 +549,36 @@
     case M117: {
         if (!value1.isEmpty()) {
             return QStringLiteral("M117 %1").arg(value1);
-        } else {
-            return QObject::tr("ERROR! M117: It's obligatory to have an argument");
         }
+        return QObject::tr("ERROR! M117: It's obligatory to have an argument");
     }
     case M119:
         return QStringLiteral("M119");
     case M140: {
         if (!value1.isEmpty()) {
             return QStringLiteral("M140 S%1").arg(value1);
-        } else {
-            return QObject::tr("ERROR! M140: It's obligatory to have an argument");
         }
+        return QObject::tr("ERROR! M140: It's obligatory to have an argument");
     }
     case M190: {
         if (!value1.isEmpty()) {
             return QStringLiteral("M190 S%1").arg(value1);
-        } else {
-            return QObject::tr("ERROR! M190: It's obligatory to have an argument");
         }
+        return QObject::tr("ERROR! M190: It's obligatory to have an argument");
     }
     case M220: {
         if (!value1.isEmpty()) {
             return QStringLiteral("M220 S%1").arg(value1);
-        } else {
-            return QObject::tr("ERROR! M220: It's obligatory to have an argument");
         }
+        return QObject::tr("ERROR! M220: It's obligatory to have an argument");
     }
     case M221: {
         if (!value1.isEmpty()) {
             return QStringLiteral("M221 S%1").arg(value1);
-        } else {
-            return QObject::tr("ERROR! M221: It's obligatory to have an argument");
         }
+        return QObject::tr("ERROR! M221: It's obligatory to have an argument");
     }
     default:
         return QObject::tr("Not supported or implemented!");
     }
 }
-
diff --git a/src/ifirmware.cpp b/src/ifirmware.cpp
--- a/src/ifirmware.cpp
+++ b/src/ifirmware.cpp
@@ -55,4 +55,3 @@
 {
     validateCommand(QString::fromLatin1(lastMessage));
 }
-
diff --git a/src/plugins/sprinterplugin.cpp b/src/plugins/sprinterplugin.cpp
--- a/src/plugins/sprinterplugin.cpp
+++ b/src/plugins/sprinterplugin.cpp
@@ -53,4 +53,3 @@
 {
     return command.toLocal8Bit();
 }
-
diff --git a/src/seriallayer.cpp b/src/seriallayer.cpp
--- a/src/seriallayer.cpp
+++ b/src/seriallayer.cpp
@@ -133,4 +133,3 @@
 {
     return _validBaudRates;
 }
-
diff --git a/testclient/mainwindow.ui b/testclient/mainwindow.ui
--- a/testclient/mainwindow.ui
+++ b/testclient/mainwindow.ui
@@ -910,7 +910,7 @@
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
-     <string>File</string>
+     <string>&amp;File</string>
     </property>
     <addaction name="actionQuit"/>
    </widget>
@@ -923,7 +923,7 @@
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>Help</string>
+     <string>&amp;Help</string>
     </property>
     <addaction name="actionAbout"/>
    </widget>
@@ -949,7 +949,7 @@
   </action>
   <action name="actionAbout">
    <property name="text">
-    <string>About</string>
+    <string>&amp;About</string>
    </property>
    <property name="shortcut">
     <string notr="true">F1</string>