diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index c7878afe..63943267 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -211,7 +211,7 @@ void AppConfig::setElevateMode(ElevateMode em) { m_ElevateMode = em; }
 
 void AppConfig::setAutoConfig(bool autoConfig) { m_AutoConfig = autoConfig; }
 
-bool AppConfig::autoConfigPrompted()  { return m_AutoConfigPrompted; }
+bool AppConfig::autoConfigPrompted() { return m_AutoConfigPrompted; }
 
 void AppConfig::setAutoConfigPrompted(bool prompted) { m_AutoConfigPrompted = prompted; }
 
diff --git a/src/gui/src/IpcClient.h b/src/gui/src/IpcClient.h
index cd398b3d..6040029c 100644
--- a/src/gui/src/IpcClient.h
+++ b/src/gui/src/IpcClient.h
@@ -28,7 +28,7 @@ class IpcReader;
 
 class IpcClient : public QObject
 {
-     Q_OBJECT
+    Q_OBJECT
 
 public:
     IpcClient();
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index d74bb66a..5d4ee8fe 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1001,7 +1001,7 @@ bool MainWindow::on_m_pButtonBrowseConfigFile_clicked()
     return false;
 }
 
-bool  MainWindow::on_m_pActionSave_triggered()
+bool MainWindow::on_m_pActionSave_triggered()
 {
     QString fileName = QFileDialog::getSaveFileName(this, tr("Save configuration as..."), QString(), barrierConfigSaveFilter);
 
diff --git a/src/gui/src/ScreenSetupModel.cpp b/src/gui/src/ScreenSetupModel.cpp
index 405ba227..5b709547 100644
--- a/src/gui/src/ScreenSetupModel.cpp
+++ b/src/gui/src/ScreenSetupModel.cpp
@@ -110,7 +110,7 @@ bool ScreenSetupModel::dropMimeData(const QMimeData* data, Qt::DropAction action
         return false;
 
      if (!parent.isValid() || row != -1 || column != -1)
-         return false;
+        return false;
 
     QByteArray encodedData = data->data(m_MimeType);
     QDataStream stream(&encodedData, QIODevice::ReadOnly);
diff --git a/src/gui/src/SslCertificate.h b/src/gui/src/SslCertificate.h
index 3ff3ff5c..e8ae2738 100644
--- a/src/gui/src/SslCertificate.h
+++ b/src/gui/src/SslCertificate.h
@@ -22,7 +22,7 @@
 
 class SslCertificate : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     explicit SslCertificate(QObject *parent = 0);
diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp
index 6ee01fc1..ab16daad 100644
--- a/src/lib/arch/win32/ArchMiscWindows.cpp
+++ b/src/lib/arch/win32/ArchMiscWindows.cpp
@@ -443,7 +443,7 @@ ArchMiscWindows::wasLaunchedAsService()
 bool ArchMiscWindows::getParentProcessName(std::string &name)
 {
     PROCESSENTRY32 parentEntry;
-    if (!getParentProcessEntry(parentEntry)){
+    if (!getParentProcessEntry(parentEntry)) {
         LOG((CLOG_ERR "could not get entry for parent process"));
         return false;
     }
diff --git a/src/lib/barrier/App.h b/src/lib/barrier/App.h
index ed034b62..749ca85d 100644
--- a/src/lib/barrier/App.h
+++ b/src/lib/barrier/App.h
@@ -90,7 +90,7 @@ public:
 
     ARCH_APP_UTIL& appUtil() { return m_appUtil; }
 
-    virtual IArchTaskBarReceiver* taskBarReceiver() const  { return m_taskBarReceiver; }
+    virtual IArchTaskBarReceiver* taskBarReceiver() const { return m_taskBarReceiver; }
 
     virtual void setByeFunc(void(*bye)(int)) { m_bye = bye; }
     virtual void bye(int error) { m_bye(error); }
diff --git a/src/lib/barrier/ArgParser.cpp b/src/lib/barrier/ArgParser.cpp
index 9cd1b8da..1ac4baff 100644
--- a/src/lib/barrier/ArgParser.cpp
+++ b/src/lib/barrier/ArgParser.cpp
@@ -373,7 +373,7 @@ ArgParser::splitCommandString(String& command, std::vector<String>& argv)
         if (space > leftDoubleQuote && space < rightDoubleQuote) {
             ignoreThisSpace = true;
         }
-        else if (space > rightDoubleQuote){
+        else if (space > rightDoubleQuote) {
             searchDoubleQuotes(command, leftDoubleQuote, rightDoubleQuote, rightDoubleQuote + 1);
         }
 
diff --git a/src/lib/net/SecureListenSocket.h b/src/lib/net/SecureListenSocket.h
index 11456879..fab92bf5 100644
--- a/src/lib/net/SecureListenSocket.h
+++ b/src/lib/net/SecureListenSocket.h
@@ -24,7 +24,7 @@ class IEventQueue;
 class SocketMultiplexer;
 class IDataSocket;
 
-class SecureListenSocket : public TCPListenSocket{
+class SecureListenSocket : public TCPListenSocket {
 public:
     SecureListenSocket(IEventQueue* events,
         SocketMultiplexer* socketMultiplexer,
diff --git a/src/lib/platform/MSWindowsSession.cpp b/src/lib/platform/MSWindowsSession.cpp
index 90b8c142..daa92768 100644
--- a/src/lib/platform/MSWindowsSession.cpp
+++ b/src/lib/platform/MSWindowsSession.cpp
@@ -94,7 +94,7 @@ MSWindowsSession::isProcessInSession(const char* name, PHANDLE process = NULL)
     }
 
     std::string nameListJoin;
-    for(std::list<std::string>::iterator it = nameList.begin();
+    for (std::list<std::string>::iterator it = nameList.begin();
         it != nameList.end(); it++) {
             nameListJoin.append(*it);
             nameListJoin.append(", ");
diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm
index 73e5b4ad..693ae45c 100644
--- a/src/lib/platform/OSXScreen.mm
+++ b/src/lib/platform/OSXScreen.mm
@@ -541,7 +541,7 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
     // This will allow for higher than triple click but the quartz documentation
     // does not specify that this should be limited to triple click
     if (press) {
-        if ((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff){
+        if ((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff) {
             m_clickState++;
         }
         else {
@@ -551,7 +551,7 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
         m_lastClickTime = ARCH->time();
     }
 
-    if (m_clickState == 1){
+    if (m_clickState == 1) {
         m_lastSingleClickXCursor = m_xCursor;
         m_lastSingleClickYCursor = m_yCursor;
     }