diff --git a/src/Adapter.cc b/src/Adapter.cc
index 79da479..e0f53de 100644
--- a/src/Adapter.cc
+++ b/src/Adapter.cc
@@ -201,7 +201,8 @@ namespace pEp {
         }
 
         // public
-        void inject_sync_shutdown() {
+        void inject_sync_shutdown()
+        {
             pEpLog("called");
             _inject_sync_event(nullptr, nullptr);
         }
@@ -231,9 +232,8 @@ namespace pEp {
         {
             if (!session._adapter_manages_sync_thread) {
                 return _sync_thread.joinable();
-            } else {
-                return false;
             }
+            return false;
         }
 
         // public
diff --git a/src/Adapter.hh b/src/Adapter.hh
index 32096c0..338a716 100644
--- a/src/Adapter.hh
+++ b/src/Adapter.hh
@@ -124,13 +124,14 @@ namespace pEp {
             ::inject_sync_event_t _inject_action;
 
         private:
+            using SessionPtr = std::unique_ptr<_pEpSession, std::function<void(PEP_SESSION)>>;
+
             void _init(
                 ::messageToSend_t messageToSend,
                 ::notifyHandshake_t notifyHandshake,
                 SyncModes sync_mode,
                 bool adapter_manages_sync_thread);
 
-            using SessionPtr = std::unique_ptr<_pEpSession, std::function<void(PEP_SESSION)>>;
             SessionPtr _session = nullptr;
         };