diff --git a/src/localzleafstarter.cpp b/src/localzleafstarter.cpp
old mode 100755
new mode 100644
index 2c25413..9455524
--- a/src/localzleafstarter.cpp
+++ b/src/localzleafstarter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Markus Prasser
+ * Copyright 2014-2018 Markus Prasser, Tobias Weiss
  *
  * This file is part of Labcontrol.
  *
@@ -17,53 +17,57 @@
  *  along with Labcontrol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <memory>
-
-#include <QMessageBox>
-
 #include "localzleafstarter.h"
 #include "ui_localzleafstarter.h"
 #include "Lib/settings.h"
 
-extern std::unique_ptr< lc::Settings > settings;
+#include <QMessageBox>
+
+#include <memory>
+
+extern std::unique_ptr<lc::Settings> settings;
 
-lc::LocalzLeafStarter::LocalzLeafStarter( QWidget *argParent ) :
-    QWidget{ argParent },
-    ui{ new Ui::LocalzLeafStarter }
+lc::LocalzLeafStarter::LocalzLeafStarter(QWidget *argParent) :
+    QWidget{argParent},
+    ui{new Ui::LocalzLeafStarter}
 {
-    ui->setupUi( this );
+    ui->setupUi(this);
 
     //Choose initial port from settings
-    if ( settings->GetChosenZTreePort() ) {
-        ui->SBzLeafPort->setValue( settings->GetChosenZTreePort() );
+    if (settings->GetChosenZTreePort()) {
+        ui->SBzLeafPort->setValue(settings->GetChosenZTreePort());
     }
 
     //Choose initial z-Leave size from settings
-    ui->LELocalzLeafSize->setText( settings->GetLocalzLeafSize() );
+    ui->LELocalzLeafSize->setText(settings->GetLocalzLeafSize());
 
 
-    ui->CBzLeafVersion->addItem( tr( "Please choose a version" ) );
-    if ( !settings->installedZTreeVersions.isEmpty() ) {
-        ui->CBzLeafVersion->addItems( settings->installedZTreeVersions );
+    ui->CBzLeafVersion->addItem(tr("Please choose a version"));
+    if (!settings->installedZTreeVersions.isEmpty()) {
+        ui->CBzLeafVersion->addItems(settings->installedZTreeVersions);
     }
 }
 
-lc::LocalzLeafStarter::~LocalzLeafStarter() {
+lc::LocalzLeafStarter::~LocalzLeafStarter()
+{
     delete ui;
 }
 
-void lc::LocalzLeafStarter::on_PBStartLocalzLeaf_clicked() {
-    if ( ui->CBzLeafVersion->currentIndex() == 0 ) {
-        QMessageBox::information( this, tr( "No z-Tree version chosen" ),
-                                  tr( "The was not chosen a z-Tree version, yet. This is"
-                                      " mandatory, so please set one" ) , QMessageBox::Ok );
+void lc::LocalzLeafStarter::on_PBStartLocalzLeaf_clicked()
+{
+    if (ui->CBzLeafVersion->currentIndex() == 0) {
+        QMessageBox::information(this, tr("No z-Tree version chosen"),
+                                 tr("The was not chosen a z-Tree version, yet."
+                                    " This is mandatory, so please set one"),
+                                 QMessageBox::Ok);
         return;
     }
 
     //Set chosen z-Leaf size
-    settings->SetLocalzLeafSize( ui->LELocalzLeafSize->text() );
+    settings->SetLocalzLeafSize(ui->LELocalzLeafSize->text());
 
     //Emit start local z-Leaf request to main window
-    emit LocalzLeafRequested( ui->LEzLeafName->text(), ui->CBzLeafVersion->currentText(),
-                              ui->SBzLeafPort->value() );
+    emit LocalzLeafRequested(ui->LEzLeafName->text(),
+                             ui->CBzLeafVersion->currentText(),
+                             ui->SBzLeafPort->value());
 }
diff --git a/src/localzleafstarter.h b/src/localzleafstarter.h
old mode 100755
new mode 100644
index ba4a951..d8704ac
--- a/src/localzleafstarter.h
+++ b/src/localzleafstarter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Markus Prasser
+ * Copyright 2014-2018 Markus Prasser, Tobias Weiss
  *
  * This file is part of Labcontrol.
  *
@@ -26,20 +26,22 @@ namespace lc {
 
 namespace Ui {
 class LocalzLeafStarter;
-}
+} // namespace Ui
 
-class LocalzLeafStarter : public QWidget {
+class LocalzLeafStarter : public QWidget
+{
     Q_OBJECT
 
 public:
-    explicit LocalzLeafStarter( QWidget *argParent = nullptr );
-    ~LocalzLeafStarter();
+    explicit LocalzLeafStarter(QWidget *argParent = nullptr);
+    ~LocalzLeafStarter() override;
 
 signals:
-    void LocalzLeafRequested( QString argzLeafName, QString argzLeafVersion, int argzTreePort );
+    void LocalzLeafRequested(QString argzLeafName, QString argzLeafVersion,
+                             int argzTreePort);
 
 private:
-    Ui::LocalzLeafStarter *ui = nullptr;
+    Ui::LocalzLeafStarter *const ui = nullptr;
 
 private slots:
     void on_PBStartLocalzLeaf_clicked();
diff --git a/src/localzleafstarter.ui b/src/localzleafstarter.ui
old mode 100755
new mode 100644