diff --git a/avogadro/molequeue/inputgenerator.cpp b/avogadro/molequeue/inputgenerator.cpp
index bf5eeeb829..9eb0c71992 100644
--- a/avogadro/molequeue/inputgenerator.cpp
+++ b/avogadro/molequeue/inputgenerator.cpp
@@ -240,7 +240,7 @@ bool InputGenerator::generateInput(const QJsonObject& options_,
             m_errors << tr("Malformed file entry at index %1: Not an object.")
                           .arg(m_filenames.size());
           } // end if/else file is JSON object
-        } // end foreach file
+        }   // end foreach file
       } else {
         result = false;
         m_errors << tr("'files' member not an array.");
diff --git a/avogadro/qtgui/interfacescript.cpp b/avogadro/qtgui/interfacescript.cpp
index 47bad7ecf8..38f555c5bd 100644
--- a/avogadro/qtgui/interfacescript.cpp
+++ b/avogadro/qtgui/interfacescript.cpp
@@ -411,7 +411,7 @@ bool InterfaceScript::generateInput(const QJsonObject& options_,
             m_errors << tr("Malformed file entry at index %1: Not an object.")
                           .arg(m_filenames.size());
           } // end if/else file is JSON object
-        } // end foreach file
+        }   // end foreach file
       } else {
         result = false;
         m_errors << tr("'files' member not an array.");
diff --git a/avogadro/qtgui/richtextdelegate.cpp b/avogadro/qtgui/richtextdelegate.cpp
index 54cd8ad0cc..5f9f2af286 100644
--- a/avogadro/qtgui/richtextdelegate.cpp
+++ b/avogadro/qtgui/richtextdelegate.cpp
@@ -24,10 +24,9 @@ namespace Avogadro::QtGui {
 
 RichTextDelegate::RichTextDelegate(QObject* parent_)
   : QStyledItemDelegate(parent_)
-{
-}
+{}
 
-RichTextDelegate::~RichTextDelegate() {};
+RichTextDelegate::~RichTextDelegate(){};
 
 QSize RichTextDelegate::sizeHint(const QStyleOptionViewItem& o,
                                  const QModelIndex& index) const
diff --git a/avogadro/qtgui/scriptloader.cpp b/avogadro/qtgui/scriptloader.cpp
index 5a3b799f0e..47b353b8c8 100644
--- a/avogadro/qtgui/scriptloader.cpp
+++ b/avogadro/qtgui/scriptloader.cpp
@@ -113,8 +113,8 @@ QMultiMap<QString, QString> ScriptLoader::scriptList(const QString& type)
                   }
                 }
               } // "commands" JSON is array
-            } // document is json
-          } // plugin.json file exists
+            }   // document is json
+          }     // plugin.json file exists
 
           continue;
         } // end reading subdirectories with plugin.json
@@ -123,7 +123,7 @@ QMultiMap<QString, QString> ScriptLoader::scriptList(const QString& type)
           fileList << filePath;
       }
     } // end dir.exists()
-  } // end for directory list
+  }   // end for directory list
 
   // go through the list of files to see if they're actually scripts
   foreach (const QString& filePath, fileList) {
@@ -144,7 +144,7 @@ QMultiMap<QString, QString> ScriptLoader::scriptList(const QString& type)
       } else // new entry
         scriptList.insert(displayName, filePath);
     } // run queryProgramName
-  } // foreach files
+  }   // foreach files
 
   return scriptList;
 }
diff --git a/avogadro/qtplugins/coordinateeditor/coordinateeditordialog.cpp b/avogadro/qtplugins/coordinateeditor/coordinateeditordialog.cpp
index 84391dd5ab..6f9c21f508 100644
--- a/avogadro/qtplugins/coordinateeditor/coordinateeditordialog.cpp
+++ b/avogadro/qtplugins/coordinateeditor/coordinateeditordialog.cpp
@@ -80,16 +80,19 @@ enum TokenType
 static const QRegularExpression TOKEN_SEPARATOR("[\\s,;]+");
 static const QRegularExpression VALID_TOKEN("[^\\s,;]+");
 // These two need to be exact
-static const QRegularExpression INT_CHECKER(QRegularExpression::anchoredPattern("(:?[+-])?\\d+"));
-static const QRegularExpression DOUBLE_CHECKER(QRegularExpression::anchoredPattern("(:?[+-])?" // Leading sign
-                                                                                   "(:?" // Must match one of the following:
-                                                                                   "\\d*\\.\\d*"           // Fractional part
-                                                                                   "|"                     // or
-                                                                                   "\\d+[Ee](:?[+-])?\\d+" // Exponential part
-                                                                                   "|"                     // or
-                                                                                   "\\d*\\.\\d*"       // Fractional part and
-                                                                                   "[Ee](:?[+-])?\\d+" // Exponential part
-                                                                                   ")"));
+static const QRegularExpression INT_CHECKER(
+  QRegularExpression::anchoredPattern("(:?[+-])?\\d+"));
+static const QRegularExpression DOUBLE_CHECKER(
+  QRegularExpression::anchoredPattern(
+    "(:?[+-])?"             // Leading sign
+    "(:?"                   // Must match one of the following:
+    "\\d*\\.\\d*"           // Fractional part
+    "|"                     // or
+    "\\d+[Ee](:?[+-])?\\d+" // Exponential part
+    "|"                     // or
+    "\\d*\\.\\d*"           // Fractional part and
+    "[Ee](:?[+-])?\\d+"     // Exponential part
+    ")"));
 
 struct AtomStruct
 {