diff --git a/tools/auto-tester/src/Test.cpp b/tools/auto-tester/src/Test.cpp
index 89c9d276d5..41c17f570f 100644
--- a/tools/auto-tester/src/Test.cpp
+++ b/tools/auto-tester/src/Test.cpp
@@ -39,8 +39,7 @@ bool Test::compareImageLists(QStringList expectedImages, QStringList resultImage
         double similarityIndex;  // in [-1.0 .. 1.0], where 1.0 means images are identical
         try {
             similarityIndex = imageComparer.compareImages(resultImage, expectedImage);
-        }
-        catch (...) {
+        } catch (...) {
             messageBox.critical(0, "Internal error", "Image not in expected format");
             exit(-1);
         }
@@ -56,17 +55,18 @@ bool Test::compareImageLists(QStringList expectedImages, QStringList resultImage
             mismatchWindow.exec();
 
             switch (mismatchWindow.getUserResponse()) {
-            case USER_RESPONSE_PASS:
-                break;
-            case USE_RESPONSE_FAIL:
-                success = false;
-                break;
-            case USER_RESPONSE_ABORT:
-                keepOn = false;
-                success = false;
-                break;
-            default:
-                assert(false);
+                case USER_RESPONSE_PASS:
+                    break;
+                case USE_RESPONSE_FAIL:
+                    success = false;
+                    break;
+                case USER_RESPONSE_ABORT:
+                    keepOn = false;
+                    success = false;
+                    break;
+                default:
+                    assert(false);
+                    break;
             }
         }
     }
diff --git a/tools/auto-tester/src/common.h b/tools/auto-tester/src/common.h
index 113bda9a1b..126177358f 100644
--- a/tools/auto-tester/src/common.h
+++ b/tools/auto-tester/src/common.h
@@ -14,12 +14,12 @@
 
 class TestFailure {
 public:
-    TestFailure(float error, QString pathname, QString expectedImageFilename, QString actualImageFilename) {
-        _error = error;
-        _pathname = pathname;
-        _expectedImageFilename = expectedImageFilename;
-        _actualImageFilename = actualImageFilename;
-    }
+    TestFailure(float error, QString pathname, QString expectedImageFilename, QString actualImageFilename) :
+        _error(error),
+        _pathname(pathname),
+        _expectedImageFilename(expectedImageFilename),
+        _actualImageFilename(actualImageFilename)
+    {}
 
     double _error;
     QString _pathname;
diff --git a/tools/auto-tester/src/main.cpp b/tools/auto-tester/src/main.cpp
index 2550e62190..6e5e06b732 100644
--- a/tools/auto-tester/src/main.cpp
+++ b/tools/auto-tester/src/main.cpp
@@ -10,8 +10,7 @@
 #include <QtWidgets/QApplication>
 #include "ui/AutoTester.h"
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     QApplication application(argc, argv);
 
     AutoTester autoTester;
diff --git a/tools/auto-tester/src/ui/AutoTester.cpp b/tools/auto-tester/src/ui/AutoTester.cpp
index 46f50f40f7..105baddb92 100644
--- a/tools/auto-tester/src/ui/AutoTester.cpp
+++ b/tools/auto-tester/src/ui/AutoTester.cpp
@@ -10,33 +10,26 @@
 //
 #include "AutoTester.h"
 
-AutoTester::AutoTester(QWidget *parent)
-    : QMainWindow(parent)
-{
+AutoTester::AutoTester(QWidget *parent) : QMainWindow(parent) {
     ui.setupUi(this);
 }
 
-void AutoTester::on_evaluateTestsButton_clicked()
-{
+void AutoTester::on_evaluateTestsButton_clicked() {
     test.evaluateTests();
 }
 
-void AutoTester::on_evaluateTestsRecursivelyButton_clicked()
-{
+void AutoTester::on_evaluateTestsRecursivelyButton_clicked() {
     test.evaluateTestsRecursively();
 }
 
-void AutoTester::on_createRecursiveScriptButton_clicked()
-{
+void AutoTester::on_createRecursiveScriptButton_clicked() {
     test.createRecursiveScript();
 }
 
-void AutoTester::on_createTestButton_clicked()
-{
+void AutoTester::on_createTestButton_clicked() {
     test.createTest();
 }
 
-void AutoTester::on_closeButton_clicked()
-{
+void AutoTester::on_closeButton_clicked() {
     exit(0);
 }
\ No newline at end of file
diff --git a/tools/auto-tester/src/ui/AutoTester.h b/tools/auto-tester/src/ui/AutoTester.h
index 31c26e0ef2..acfea32ba1 100644
--- a/tools/auto-tester/src/ui/AutoTester.h
+++ b/tools/auto-tester/src/ui/AutoTester.h
@@ -15,8 +15,7 @@
 #include "ui_AutoTester.h"
 #include "../Test.h"
 
-class AutoTester : public QMainWindow
-{
+class AutoTester : public QMainWindow {
     Q_OBJECT
 
 public:
diff --git a/tools/auto-tester/src/ui/MismatchWindow.cpp b/tools/auto-tester/src/ui/MismatchWindow.cpp
index 09ad97a596..07664a1667 100644
--- a/tools/auto-tester/src/ui/MismatchWindow.cpp
+++ b/tools/auto-tester/src/ui/MismatchWindow.cpp
@@ -11,9 +11,7 @@
 
 #include <QtCore/QFileInfo>
 
-MismatchWindow::MismatchWindow(QWidget *parent)
-    : QDialog(parent)
-{
+MismatchWindow::MismatchWindow(QWidget *parent) : QDialog(parent) {
     setupUi(this);
 
     expectedImage->setScaledContents(true);
@@ -32,20 +30,17 @@ void MismatchWindow::setTestFailure(TestFailure testFailure) {
     resultImage->setPixmap(QPixmap(testFailure._pathname + testFailure._actualImageFilename));
 }
 
-void MismatchWindow::on_passTestButton_clicked()
-{
+void MismatchWindow::on_passTestButton_clicked() {
     _userResponse = USER_RESPONSE_PASS;
     close();
 }
 
-void MismatchWindow::on_failTestButton_clicked()
-{
+void MismatchWindow::on_failTestButton_clicked() {
     _userResponse = USE_RESPONSE_FAIL;
     close();
 }
 
-void MismatchWindow::on_abortTestsButton_clicked()
-{
+void MismatchWindow::on_abortTestsButton_clicked() {
     _userResponse = USER_RESPONSE_ABORT;
     close();
 }