diff --git a/gui/gmapdlg.cc b/gui/gmapdlg.cc
index 91f3f2169..81cb2d49e 100644
--- a/gui/gmapdlg.cc
+++ b/gui/gmapdlg.cc
@@ -193,7 +193,7 @@ GMapDialog::GMapDialog(QWidget* parent, const Gpx& mapData, QPlainTextEdit* te):
   ui_.treeView->setModel(model_);
   ui_.treeView->setExpandsOnDoubleClick(false);
   connect(model_, &QStandardItemModel::itemChanged,
-          this,  &GMapDialog::itemChangedX);
+          this, &GMapDialog::itemChangedX);
   connect(mapWidget_, &Map::waypointClicked, this, [this](int i)->void {
     itemClickedX(wptItem_->child(i));
   });
@@ -222,7 +222,7 @@ void GMapDialog::showHideChild(const QStandardItem* child)
   int row = child->row();
   if (top == wptItem_) {
     mapWidget_->setWaypointVisibility(row, show);
-  } else if (top ==  trkItem_) {
+  } else if (top == trkItem_) {
     mapWidget_->setTrackVisibility(row, show);
   } else if (top == rteItem_) {
     mapWidget_->setRouteVisibility(row, show);
@@ -291,7 +291,7 @@ void GMapDialog::itemClickedX(const QStandardItem* it)
 }
 
 //-------------------------------------------------------------------------
-void GMapDialog::selectionChangedX(const QItemSelection& sel,  const QItemSelection& desel)
+void GMapDialog::selectionChangedX(const QItemSelection& sel, const QItemSelection& desel)
 {
   if constexpr(debug_) {
     qDebug() << "selectionChangedX";
@@ -403,7 +403,7 @@ void GMapDialog::showContextMenu(const QPoint& pt)
                                   tr("Collapse All")
                                  };
       showTopContextMenu(labels, it, pt);
-    } else if (it !=  nullptr) {
+    } else if (it != nullptr) {
       QStandardItem* parent = it->parent();
       if (parent == wptItem_) {
         showChildContextMenu(tr("Show Only This Waypoint"), it, pt);
diff --git a/gui/gmapdlg.h b/gui/gmapdlg.h
index 89fc82d35..1610f928c 100644
--- a/gui/gmapdlg.h
+++ b/gui/gmapdlg.h
@@ -73,8 +73,7 @@ class GMapDialog: public QDialog
 private slots:
   void itemChangedX(QStandardItem* it);
   void treeDoubleClicked(const QModelIndex& idx);
-  void selectionChangedX(const QItemSelection& sel,  const QItemSelection& desel);
+  void selectionChangedX(const QItemSelection& sel, const QItemSelection& desel);
   void showContextMenu(const QPoint& pt);
 };
-
 #endif
diff --git a/gui/gpx.cc b/gui/gpx.cc
index 17aaac2cc..f725f253c 100644
--- a/gui/gpx.cc
+++ b/gui/gpx.cc
@@ -224,7 +224,7 @@ QString Gpx::read(const QString& fileName)
   QXmlStreamReader reader(&file);
   GpxHandler gpxHandler;
 
-  for (bool atEnd = false; !reader.atEnd() && !atEnd;)  {
+  for (bool atEnd = false; !reader.atEnd() && !atEnd;) {
     reader.readNext();
     // do processing
     switch (reader.tokenType()) {
diff --git a/gui/gpx.h b/gui/gpx.h
index 57eacee1a..da6a33412 100644
--- a/gui/gpx.h
+++ b/gui/gpx.h
@@ -150,7 +150,7 @@ class GpxTrackPoint
 
 private:
   LatLng location;
-  double  elevation{0.0};
+  double elevation{0.0};
   QDateTime dateTime;
 };
 
@@ -258,7 +258,7 @@ class GpxTrack
   }
 
 private:
-  int     number{1};
+  int number{1};
   QString name;
   QString comment;
   QString description;
@@ -332,7 +332,7 @@ class GpxWaypoint
 
 private:
   LatLng location_;
-  double  elevation_{-1.0E-100};
+  double elevation_{-1.0E-100};
   QString name_;
   QString comment_;
   QString description_;
@@ -362,9 +362,7 @@ class Gpx
 
 private:
   QList <GpxWaypoint> wayPoints;
-  QList <GpxTrack>    tracks;
-  QList <GpxRoute>    routes;
+  QList <GpxTrack> tracks;
+  QList <GpxRoute> routes;
 };
-
-
 #endif
diff --git a/gui/map.cc b/gui/map.cc
index 1179f5d2a..38d4863fa 100644
--- a/gui/map.cc
+++ b/gui/map.cc
@@ -59,7 +59,7 @@ static QString stripDoubleQuotes(const QString& s)
 
 //------------------------------------------------------------------------
 Map::Map(QWidget* parent,
-         const Gpx&  gpx, QPlainTextEdit* te):
+         const Gpx& gpx, QPlainTextEdit* te):
   QWebEngineView(parent),
   gpx_(gpx),
   textEdit_(te)
@@ -83,7 +83,7 @@ Map::Map(QWidget* parent,
   // 1. In the file system in the same directory as the executable.
   // 2. In the Qt resource system.  This is useful if the resource was compiled
   //    into the executable.
-  QString baseFile =  QApplication::applicationDirPath() + "/gmapbase.html";
+  QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html";
   QString fileName;
   QUrl baseUrl;
   if (QFile(baseFile).exists()) {
@@ -186,7 +186,7 @@ void Map::loadFinishedX(bool f)
 //------------------------------------------------------------------------
 static QString fmtLatLng(const LatLng& l)
 {
-  return  QString("{lat: %1, lng: %3}").arg(l.lat(), 0, 'f', 5) .arg(l.lng(), 0, 'f', 5);
+  return QString("{lat: %1, lng: %3}").arg(l.lat(), 0, 'f', 5) .arg(l.lng(), 0, 'f', 5);
 }
 
 //------------------------------------------------------------------------
diff --git a/gui/map.h b/gui/map.h
index 688af2ed7..4c0e0ec57 100644
--- a/gui/map.h
+++ b/gui/map.h
@@ -74,7 +74,7 @@ class Map : public QWebEngineView
   Q_OBJECT
 public:
   Map(QWidget* parent,
-      const Gpx&  gpx_, QPlainTextEdit* textEdit_);
+      const Gpx& gpx_, QPlainTextEdit* textEdit_);
   ~Map();
 
   void showGpxData();