diff --git a/GUI/View/Intensity/SavePlotAssistant.cpp b/GUI/View/Intensity/SavePlotAssistant.cpp
index 41cfd8e0936b5d692d35bbd6922ce11fd737a4d8..cd8f95ce601989d090950b6023c90b89acfd0981 100644
--- a/GUI/View/Intensity/SavePlotAssistant.cpp
+++ b/GUI/View/Intensity/SavePlotAssistant.cpp
@@ -100,33 +100,28 @@ QString getFilterString()
 
 bool isValidExtension(const QString& fileName)
 {
-    for (int i = 0; i < outFormats.size(); ++i) {
+    for (int i = 0; i < outFormats.size(); ++i)
         if (fileName.endsWith(outFormats[i].m_file_extention, Qt::CaseInsensitive))
             return true;
-    }
     return false;
 }
 
 QString getExtensionFromFilterName(const QString& filterName)
 {
-    for (int i = 0; i < outFormats.size(); ++i) {
+    for (int i = 0; i < outFormats.size(); ++i)
         if (outFormats[i].m_filter == filterName)
             return outFormats[i].m_file_extention;
-    }
     return "";
 }
 
 //! Compose file name to save plot from information provided by QFileDialog
 QString composeFileName(const QString& fileName, const QString& filterName)
 {
-    QString result;
-    if (!fileName.isEmpty() && !filterName.isEmpty()) {
-        if (isValidExtension(fileName))
-            result = fileName;
-        else
-            result = fileName + getExtensionFromFilterName(filterName);
-    }
-    return result;
+    if (fileName.isEmpty() || filterName.isEmpty())
+        return "";
+    if (isValidExtension(fileName))
+        return fileName;
+    return fileName + getExtensionFromFilterName(filterName);
 }
 
 } // namespace