diff --git a/src/cameramanager.cpp b/src/cameramanager.cpp
index 6600d55..4b0b7ea 100644
--- a/src/cameramanager.cpp
+++ b/src/cameramanager.cpp
@@ -4,7 +4,11 @@
 
 using namespace FlyCapture2;
 
-CameraManager::CameraManager( QObject * parent ) : QObject( parent ), num_cameras {0}, camera_index {-1}, is_capturing {false} {
+CameraManager::CameraManager( QObject * parent ) :
+    QObject( parent ),
+    num_cameras {0},
+    is_capturing {false},
+    camera_index {-1} {
     bus_mgr.RegisterCallback( &CameraManager::camConnectEvent, ARRIVAL, this, &handleC );
     bus_mgr.RegisterCallback( &CameraManager::camDisconnectEvent, REMOVAL, this, &handleD );
 }
diff --git a/src/cameramanager.h b/src/cameramanager.h
index aebf59d..c12ba02 100644
--- a/src/cameramanager.h
+++ b/src/cameramanager.h
@@ -64,12 +64,12 @@ class CameraManager : public QObject {
 
         unsigned int num_cameras;
 
-        // GUID of the camera, which is currently being used
-        FlyCapture2::PGRGuid camera_guid;
-
         // Index of the current camera
         int camera_index;
 
+        // GUID of the camera, which is currently being used
+        FlyCapture2::PGRGuid camera_guid;
+
         // Event Handlers
         static void camConnectEvent( void * pParameter, unsigned int serialNumber );
         static void camDisconnectEvent( void * pParameter, unsigned int serialNumber );
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a070f9a..0fc05d3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -15,8 +15,8 @@ MainWindow::MainWindow( QWidget * parent ) :
     ui( new Ui::MainWindow ),
     camMan( this ),
     recorder( 0, 18, false ),
-    resize { false },
-    comm( this ) {
+    comm( this ),
+    resize { false } {
     ui->setupUi( this );
 
     // Set Scene and Hide Preview Widget
diff --git a/src/recorder.cpp b/src/recorder.cpp
index e78ab6e..d4c8b68 100644
--- a/src/recorder.cpp
+++ b/src/recorder.cpp
@@ -14,7 +14,13 @@ const QHash<RecorderError::_RecorderError, QString> RecorderError::_description
     { RecorderError::OK, "All went OK." },
 };
 
-Recorder::Recorder( QObject * parent, unsigned int frame_rate, bool cap_frames ) : QObject( parent ), is_recording {false}, append {false}, frame_n {0}, time_c {0}, pDirSet { false } {
+Recorder::Recorder( QObject * parent, unsigned int frame_rate, bool cap_frames ) :
+    QObject( parent ),
+    is_recording {false},
+    pDirSet { false },
+    append {false},
+    frame_n {0},
+    time_c {0} {
     // No Compression for frame_captures
     frame_options.compression = frame_options.NONE;
     options.frameRate = frame_rate;
diff --git a/src/recorder.h b/src/recorder.h
index 25b31f5..563c34a 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -121,13 +121,13 @@ class Recorder : public QObject {
         // lock the appendFrame function.
         QMutex write_lock;
 
-        // Indicates wether the project directorie is set.
-        bool pDirSet;
-
         // basic state Variable, because AVIRecorder doesn't provide it.
         // Well it does, but it is boring to look it up.
         bool is_recording;
 
+        // Indicates wether the project directorie is set.
+        bool pDirSet;
+
         // append to existing files
         bool append;
 
diff --git a/third_party/bin/libflycapture.so.2 b/third_party/bin/libflycapture.so.2
deleted file mode 100644
index 015e1b5..0000000
Binary files a/third_party/bin/libflycapture.so.2 and /dev/null differ