diff --git a/GUI/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
index 0a26f94e4e3b1e518784f14c8dca391bd7a954aa..59738e8d10a162ae4a05932380747d4ed99555d1 100644
--- a/GUI/Models/JobItem.cpp
+++ b/GUI/Models/JobItem.cpp
@@ -189,8 +189,7 @@ std::optional<size_t> JobItem::duration() const
     QDateTime end_time = endTime();
     if (begin_time.isValid() && end_time.isValid() && begin_time < end_time)
         return begin_time.msecsTo(end_time);
-    else
-        return std::nullopt;
+    return std::nullopt;
 }
 
 QString JobItem::getComments() const
diff --git a/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp b/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp
index ea2d0dd3c28a6d0c876f8f9e522c359dae5b8f12..04c55fb0bfd934bc1efeb06ba00395793e4897ab 100644
--- a/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp
@@ -54,16 +54,14 @@ int JobPropertiesTableModel::rowCount(const QModelIndex& parent) const
 {
     if (!parent.isValid() && m_item)
         return NumRows;
-    else
-        return 0;
+    return 0;
 }
 
 int JobPropertiesTableModel::columnCount(const QModelIndex& parent) const
 {
     if (!parent.isValid() && m_item)
         return NumColumns;
-    else
-        return 0;
+    return 0;
 }
 
 QVariant JobPropertiesTableModel::data(const QModelIndex& index, int role) const
@@ -76,40 +74,30 @@ QVariant JobPropertiesTableModel::data(const QModelIndex& index, int role) const
     switch (index.column()) {
     case Column::Name:
         return RowNames[index.row()];
-        break;
     case Column::Value: {
         switch (index.row()) {
         case Row::Name:
             return m_item->itemName();
-            break;
         case Row::Sample:
             return m_item->sampleName();
-            break;
         case Row::Instrument:
             return m_item->instrumentName();
-            break;
         case Row::Status:
             return jobStatusToString(m_item->getStatus());
-            break;
         case Row::Begin:
             if (role == Qt::ToolTipRole)
                 return m_item->beginTime().toString(Qt::DefaultLocaleLongDate);
-            else
-                return m_item->beginTime().toString(ModelDateShortFormat);
-            break;
+            return m_item->beginTime().toString(ModelDateShortFormat);
         case Row::End:
             if (role == Qt::ToolTipRole)
                 return m_item->endTime().toString(Qt::DefaultLocaleLongDate);
-            else
-                return m_item->endTime().toString(ModelDateShortFormat);
-            break;
+            return m_item->endTime().toString(ModelDateShortFormat);
         case Row::Duration: {
             std::optional<size_t> duration = m_item->duration();
             if (duration)
                 return QString("%1 s").arg(duration.value() / 1000., 0, 'f', 3);
-            else
-                return QVariant();
-        } break;
+            return QVariant();
+        }
         default:
             return QVariant();
         }
@@ -125,8 +113,7 @@ QVariant JobPropertiesTableModel::headerData(int section, Qt::Orientation orient
     if (role == Qt::DisplayRole && orientation == Qt::Horizontal && section >= 0
         && section < NumColumns)
         return ColumnNames[section];
-    else
-        return QVariant();
+    return QVariant();
 }
 
 Qt::ItemFlags JobPropertiesTableModel::flags(const QModelIndex& index) const