diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
index 543c20730..e433855a5 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
@@ -52,42 +52,28 @@ static void setSignalSet(sigset_t *sigset)
 class ArchThreadImpl
 {
 public:
-  ArchThreadImpl();
+  ArchThreadImpl() = default;
 
 public:
-  int m_refCount;
-  IArchMultithread::ThreadID m_id;
+  int m_refCount = 1;
+  IArchMultithread::ThreadID m_id = 0;
   pthread_t m_thread;
-  IArchMultithread::ThreadFunc m_func;
-  void *m_userData;
-  bool m_cancel;
-  bool m_cancelling;
-  bool m_exited;
-  void *m_result;
-  void *m_networkData;
+  IArchMultithread::ThreadFunc m_func = nullptr;
+  void *m_userData = nullptr;
+  bool m_cancel = false;
+  bool m_cancelling = false;
+  bool m_exited = false;
+  void *m_result = nullptr;
+  void *m_networkData = nullptr;
 };
 
-ArchThreadImpl::ArchThreadImpl()
-    : m_refCount(1),
-      m_id(0),
-      m_func(nullptr),
-      m_userData(nullptr),
-      m_cancel(false),
-      m_cancelling(false),
-      m_exited(false),
-      m_result(nullptr),
-      m_networkData(nullptr)
-{
-  // do nothing
-}
-
 //
 // ArchMultithreadPosix
 //
 
 ArchMultithreadPosix *ArchMultithreadPosix::s_instance = nullptr;
 
-ArchMultithreadPosix::ArchMultithreadPosix() : m_newThreadCalled(false), m_nextID(0)
+ArchMultithreadPosix::ArchMultithreadPosix()
 {
   assert(s_instance == nullptr);
 
diff --git a/src/lib/arch/unix/ArchMultithreadPosix.h b/src/lib/arch/unix/ArchMultithreadPosix.h
index 6fd153c5c..98cf289ee 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.h
+++ b/src/lib/arch/unix/ArchMultithreadPosix.h
@@ -99,12 +99,12 @@ private:
 
   static ArchMultithreadPosix *s_instance;
 
-  bool m_newThreadCalled;
+  bool m_newThreadCalled = false;
 
   ArchMutex m_threadMutex;
   ArchThread m_mainThread;
   ThreadList m_threadList;
-  ThreadID m_nextID;
+  ThreadID m_nextID = 0;
 
   pthread_t m_signalThread;
   SignalFunc m_signalFunc[kNUM_SIGNALS];
diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp
index c1698991b..a055a3e67 100644
--- a/src/lib/base/Event.cpp
+++ b/src/lib/base/Event.cpp
@@ -10,18 +10,11 @@
 //
 // Event
 //
-
-Event::Event() : m_type(EventTypes::Unknown), m_target(nullptr), m_data(nullptr), m_flags(0), m_dataObject(nullptr)
-{
-  // do nothing
-}
-
 Event::Event(EventTypes type, void *target, void *data, Flags flags)
     : m_type(type),
       m_target(target),
       m_data(data),
-      m_flags(flags),
-      m_dataObject(nullptr)
+      m_flags(flags)
 {
   // do nothing
 }
@@ -29,8 +22,6 @@ Event::Event(EventTypes type, void *target, void *data, Flags flags)
 Event::Event(EventTypes type, void *target, EventData *dataObject)
     : m_type(type),
       m_target(target),
-      m_data(nullptr),
-      m_flags(kNone),
       m_dataObject(dataObject)
 {
   // do nothing
diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h
index b12f4eb87..8fa2d1b34 100644
--- a/src/lib/base/Event.h
+++ b/src/lib/base/Event.h
@@ -34,7 +34,7 @@ public:
     kDontFreeData = 0x02        //!< Don't free data in deleteData
   };
 
-  Event();
+  Event() = default;
 
   //! Create \c Event with data (POD)
   /*!
@@ -110,9 +110,9 @@ public:
   //@}
 
 private:
-  EventTypes m_type;
-  void *m_target;
-  void *m_data;
-  Flags m_flags;
-  EventData *m_dataObject;
+  EventTypes m_type = EventTypes::Unknown;
+  void *m_target = nullptr;
+  void *m_data = nullptr;
+  Flags m_flags = kNone;
+  EventData *m_dataObject = nullptr;
 };
diff --git a/src/lib/base/EventQueue.cpp b/src/lib/base/EventQueue.cpp
index be86841f8..ed94cc0b7 100644
--- a/src/lib/base/EventQueue.cpp
+++ b/src/lib/base/EventQueue.cpp
@@ -27,10 +27,7 @@ static void interrupt(Arch::ESignal, void *data)
 // EventQueue
 //
 
-EventQueue::EventQueue()
-    : m_systemTarget(0),
-      m_readyMutex(new Mutex),
-      m_readyCondVar(new CondVar<bool>(m_readyMutex, false))
+EventQueue::EventQueue() : m_readyMutex(new Mutex), m_readyCondVar(new CondVar<bool>(m_readyMutex, false))
 {
   m_mutex = ARCH->newMutex();
   ARCH->setSignalHandler(Arch::kINTERRUPT, &interrupt, this);
diff --git a/src/lib/base/EventQueue.h b/src/lib/base/EventQueue.h
index 8eb358460..cd5abe249 100644
--- a/src/lib/base/EventQueue.h
+++ b/src/lib/base/EventQueue.h
@@ -102,11 +102,11 @@ private:
   using TypeHandlerTable = std::map<EventTypes, IEventJob *>;
   using HandlerTable = std::map<void *, TypeHandlerTable>;
 
-  int m_systemTarget;
+  int m_systemTarget = 0;
   ArchMutex m_mutex;
 
   // buffer of events
-  IEventQueueBuffer *m_buffer;
+  IEventQueueBuffer *m_buffer = nullptr;
 
   // saved events
   EventTable m_events;
@@ -122,7 +122,7 @@ private:
   HandlerTable m_handlers;
 
 private:
-  Mutex *m_readyMutex;
-  CondVar<bool> *m_readyCondVar;
+  Mutex *m_readyMutex = nullptr;
+  CondVar<bool> *m_readyCondVar = nullptr;
   std::queue<Event> m_pending;
 };
diff --git a/src/lib/base/LogOutputters.cpp b/src/lib/base/LogOutputters.cpp
index a7b2277d0..fecab83de 100644
--- a/src/lib/base/LogOutputters.cpp
+++ b/src/lib/base/LogOutputters.cpp
@@ -106,7 +106,7 @@ bool SystemLogOutputter::write(ELevel level, const char *msg)
 // SystemLogger
 //
 
-SystemLogger::SystemLogger(const char *title, bool blockConsole) : m_stop(nullptr)
+SystemLogger::SystemLogger(const char *title, bool blockConsole)
 {
   // redirect log messages
   if (blockConsole) {
diff --git a/src/lib/base/LogOutputters.h b/src/lib/base/LogOutputters.h
index a2d3f925d..ede630522 100644
--- a/src/lib/base/LogOutputters.h
+++ b/src/lib/base/LogOutputters.h
@@ -111,6 +111,6 @@ public:
   SystemLogger &operator=(SystemLogger &&) = delete;
 
 private:
-  ILogOutputter *m_syslog;
-  ILogOutputter *m_stop;
+  ILogOutputter *m_syslog = nullptr;
+  ILogOutputter *m_stop = nullptr;
 };
diff --git a/src/lib/base/SimpleEventQueueBuffer.cpp b/src/lib/base/SimpleEventQueueBuffer.cpp
index 903379e1b..35d4d830c 100644
--- a/src/lib/base/SimpleEventQueueBuffer.cpp
+++ b/src/lib/base/SimpleEventQueueBuffer.cpp
@@ -21,7 +21,6 @@ SimpleEventQueueBuffer::SimpleEventQueueBuffer()
 {
   m_queueMutex = ARCH->newMutex();
   m_queueReadyCond = ARCH->newCondVar();
-  m_queueReady = false;
 }
 
 SimpleEventQueueBuffer::~SimpleEventQueueBuffer()
diff --git a/src/lib/base/SimpleEventQueueBuffer.h b/src/lib/base/SimpleEventQueueBuffer.h
index 3984eb288..5db125a59 100644
--- a/src/lib/base/SimpleEventQueueBuffer.h
+++ b/src/lib/base/SimpleEventQueueBuffer.h
@@ -42,6 +42,6 @@ private:
 
   ArchMutex m_queueMutex;
   ArchCond m_queueReadyCond;
-  bool m_queueReady;
+  bool m_queueReady = false;
   EventDeque m_queue;
 };
diff --git a/src/lib/base/Stopwatch.cpp b/src/lib/base/Stopwatch.cpp
index 8871f8d93..c29e62298 100644
--- a/src/lib/base/Stopwatch.cpp
+++ b/src/lib/base/Stopwatch.cpp
@@ -12,7 +12,7 @@
 // Stopwatch
 //
 
-Stopwatch::Stopwatch(bool triggered) : m_mark(0.0), m_triggered(triggered), m_stopped(triggered)
+Stopwatch::Stopwatch(bool triggered) : m_triggered(triggered), m_stopped(triggered)
 {
   if (!triggered) {
     m_mark = ARCH->time();
diff --git a/src/lib/base/Stopwatch.h b/src/lib/base/Stopwatch.h
index d4be45ffd..b85d2ef28 100644
--- a/src/lib/base/Stopwatch.h
+++ b/src/lib/base/Stopwatch.h
@@ -93,7 +93,7 @@ private:
   double getClock() const;
 
 private:
-  double m_mark;
-  bool m_triggered;
-  bool m_stopped;
+  double m_mark = 0.0;
+  bool m_triggered = false;
+  bool m_stopped = false;
 };
diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
index f8a631e31..597dfc9d0 100644
--- a/src/lib/client/Client.cpp
+++ b/src/lib/client/Client.cpp
@@ -48,23 +48,13 @@ Client::Client(
     IEventQueue *events, const std::string &name, const NetworkAddress &address, ISocketFactory *socketFactory,
     deskflow::Screen *screen, deskflow::ClientArgs const &args
 )
-    : m_mock(false),
-      m_name(name),
+    : m_name(name),
       m_serverAddress(address),
       m_socketFactory(socketFactory),
       m_screen(screen),
-      m_stream(nullptr),
-      m_timer(nullptr),
-      m_server(nullptr),
-      m_ready(false),
-      m_active(false),
-      m_suspended(false),
-      m_connectOnResume(false),
       m_events(events),
       m_useSecureNetwork(args.m_enableCrypto),
-      m_args(args),
-      m_enableClipboard(true),
-      m_maximumClipboardSize(INT_MAX)
+      m_args(args)
 {
   assert(m_socketFactory != nullptr);
   assert(m_screen != nullptr);
@@ -93,10 +83,6 @@ Client::Client(
 
 Client::~Client()
 {
-  if (m_mock) {
-    return;
-  }
-
   m_events->removeHandler(EventTypes::ScreenSuspend, getEventTarget());
   m_events->removeHandler(EventTypes::ScreenResume, getEventTarget());
 
diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h
index 3da40df0c..0fc6ad077 100644
--- a/src/lib/client/Client.h
+++ b/src/lib/client/Client.h
@@ -43,11 +43,11 @@ public:
   class FailInfo
   {
   public:
-    explicit FailInfo(const char *what) : m_retry(false), m_what(what)
+    explicit FailInfo(const char *what) : m_what(what)
     {
       // do nothing
     }
-    bool m_retry;
+    bool m_retry = false;
     std::string m_what;
   };
 
@@ -182,29 +182,26 @@ private:
   void sendClipboardThread(void *);
   void bindNetworkInterface(IDataSocket *socket) const;
 
-public:
-  bool m_mock;
-
 private:
   std::string m_name;
   NetworkAddress m_serverAddress;
-  ISocketFactory *m_socketFactory;
-  deskflow::Screen *m_screen;
-  deskflow::IStream *m_stream;
-  EventQueueTimer *m_timer;
-  ServerProxy *m_server;
-  bool m_ready;
-  bool m_active;
-  bool m_suspended;
-  bool m_connectOnResume;
+  ISocketFactory *m_socketFactory = nullptr;
+  deskflow::Screen *m_screen = nullptr;
+  deskflow::IStream *m_stream = nullptr;
+  EventQueueTimer *m_timer = nullptr;
+  ServerProxy *m_server = nullptr;
+  bool m_ready = false;
+  bool m_active = false;
+  bool m_suspended = false;
+  bool m_connectOnResume = false;
   bool m_ownClipboard[kClipboardEnd];
   bool m_sentClipboard[kClipboardEnd];
   IClipboard::Time m_timeClipboard[kClipboardEnd];
   std::string m_dataClipboard[kClipboardEnd];
-  IEventQueue *m_events;
-  bool m_useSecureNetwork;
-  bool m_enableClipboard;
-  size_t m_maximumClipboardSize;
+  IEventQueue *m_events = nullptr;
+  bool m_useSecureNetwork = false;
+  bool m_enableClipboard = true;
+  size_t m_maximumClipboardSize = INT_MAX;
   deskflow::ClientArgs m_args;
   size_t m_resolvedAddressesCount = 0;
   std::unique_ptr<deskflow::client::HelloBack> m_pHelloBack;
diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp
index c13eb76af..15e03f457 100644
--- a/src/lib/client/ServerProxy.cpp
+++ b/src/lib/client/ServerProxy.cpp
@@ -33,16 +33,6 @@
 ServerProxy::ServerProxy(Client *client, deskflow::IStream *stream, IEventQueue *events)
     : m_client(client),
       m_stream(stream),
-      m_seqNum(0),
-      m_compressMouse(false),
-      m_compressMouseRelative(false),
-      m_xMouse(0),
-      m_yMouse(0),
-      m_dxMouse(0),
-      m_dyMouse(0),
-      m_ignoreMouse(false),
-      m_keepAliveAlarm(0.0),
-      m_keepAliveAlarmTimer(nullptr),
       m_parser(&ServerProxy::parseHandshakeMessage),
       m_events(events)
 {
diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h
index 3cd6a9829..66b8877c5 100644
--- a/src/lib/client/ServerProxy.h
+++ b/src/lib/client/ServerProxy.h
@@ -105,27 +105,27 @@ private:
 private:
   using MessageParser = EResult (ServerProxy::*)(const uint8_t *);
 
-  Client *m_client;
-  deskflow::IStream *m_stream;
+  Client *m_client = nullptr;
+  deskflow::IStream *m_stream = nullptr;
 
-  uint32_t m_seqNum;
+  uint32_t m_seqNum = 0;
 
-  bool m_compressMouse;
-  bool m_compressMouseRelative;
-  int32_t m_xMouse;
-  int32_t m_yMouse;
-  int32_t m_dxMouse;
-  int32_t m_dyMouse;
+  bool m_compressMouse = false;
+  bool m_compressMouseRelative = false;
+  int32_t m_xMouse = 0;
+  int32_t m_yMouse = 0;
+  int32_t m_dxMouse = 0;
+  int32_t m_dyMouse = 0;
 
-  bool m_ignoreMouse;
+  bool m_ignoreMouse = false;
 
   KeyModifierID m_modifierTranslationTable[kKeyModifierIDLast];
 
-  double m_keepAliveAlarm;
-  EventQueueTimer *m_keepAliveAlarmTimer;
+  double m_keepAliveAlarm = 0.0;
+  EventQueueTimer *m_keepAliveAlarmTimer = nullptr;
 
   MessageParser m_parser;
-  IEventQueue *m_events;
+  IEventQueue *m_events = nullptr;
   std::string m_serverLanguage = "";
   bool m_isUserNotifiedAboutLanguageSyncError = false;
   deskflow::languages::LanguageManager m_languageManager;
diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp
index 0c060343f..be51a5875 100644
--- a/src/lib/deskflow/App.cpp
+++ b/src/lib/deskflow/App.cpp
@@ -43,12 +43,9 @@ App *App::s_instance = nullptr;
 
 App::App(IEventQueue *events, deskflow::ArgsBase *args)
     : m_bye(&exit),
-      m_suspended(false),
       m_events(events),
       m_args(args),
-      m_fileLog(nullptr),
-      m_appUtil(events),
-      m_socketMultiplexer(nullptr)
+      m_appUtil(events)
 {
   assert(s_instance == nullptr);
   s_instance = this;
diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h
index b711cf38f..e0d163d63 100644
--- a/src/lib/deskflow/App.h
+++ b/src/lib/deskflow/App.h
@@ -112,15 +112,15 @@ public:
 protected:
   void runEventsLoop(void *);
 
-  bool m_suspended;
-  IEventQueue *m_events;
+  bool m_suspended = false;
+  IEventQueue *m_events = nullptr;
 
 private:
   deskflow::ArgsBase *m_args;
   static App *s_instance;
-  FileLogOutputter *m_fileLog;
+  FileLogOutputter *m_fileLog = nullptr;
   ARCH_APP_UTIL m_appUtil;
-  SocketMultiplexer *m_socketMultiplexer;
+  SocketMultiplexer *m_socketMultiplexer = nullptr;
 };
 
 #if WINAPI_MSWINDOWS
diff --git a/src/lib/deskflow/AppUtil.cpp b/src/lib/deskflow/AppUtil.cpp
index d0cd57a25..cfbeffe25 100644
--- a/src/lib/deskflow/AppUtil.cpp
+++ b/src/lib/deskflow/AppUtil.cpp
@@ -11,7 +11,7 @@
 
 AppUtil *AppUtil::s_instance = nullptr;
 
-AppUtil::AppUtil() : m_app(nullptr)
+AppUtil::AppUtil()
 {
   s_instance = this;
 }
diff --git a/src/lib/deskflow/AppUtil.h b/src/lib/deskflow/AppUtil.h
index 6e7021dec..de1e3e30e 100644
--- a/src/lib/deskflow/AppUtil.h
+++ b/src/lib/deskflow/AppUtil.h
@@ -30,6 +30,6 @@ public:
   }
 
 private:
-  IApp *m_app;
+  IApp *m_app = nullptr;
   static AppUtil *s_instance;
 };
diff --git a/src/lib/deskflow/Chunk.cpp b/src/lib/deskflow/Chunk.cpp
index 925ff280b..d5b2146c1 100644
--- a/src/lib/deskflow/Chunk.cpp
+++ b/src/lib/deskflow/Chunk.cpp
@@ -7,9 +7,8 @@
 #include "deskflow/Chunk.h"
 #include "base/String.h"
 
-Chunk::Chunk(size_t size) : m_dataSize(0)
+Chunk::Chunk(size_t size) : m_chunk{new char[size]}
 {
-  m_chunk = new char[size];
   memset(m_chunk, 0, size);
 }
 
diff --git a/src/lib/deskflow/Chunk.h b/src/lib/deskflow/Chunk.h
index 9701d1169..8ce66d455 100644
--- a/src/lib/deskflow/Chunk.h
+++ b/src/lib/deskflow/Chunk.h
@@ -21,6 +21,6 @@ public:
   Chunk &operator=(Chunk &&) = delete;
 
 public:
-  size_t m_dataSize;
-  char *m_chunk;
+  size_t m_dataSize = 0;
+  char *m_chunk = nullptr;
 };
diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp
index 1902eb3e9..d4d1bd9a9 100644
--- a/src/lib/deskflow/ClientApp.cpp
+++ b/src/lib/deskflow/ClientApp.cpp
@@ -60,11 +60,7 @@
 
 #define RETRY_TIME 1.0
 
-ClientApp::ClientApp(IEventQueue *events)
-    : App(events, new deskflow::ClientArgs()),
-      m_client(nullptr),
-      m_clientScreen(nullptr),
-      m_serverAddress(nullptr)
+ClientApp::ClientApp(IEventQueue *events) : App(events, new deskflow::ClientArgs())
 {
   // do nothing
 }
diff --git a/src/lib/deskflow/ClientApp.h b/src/lib/deskflow/ClientApp.h
index e38d82562..e96633c9a 100644
--- a/src/lib/deskflow/ClientApp.h
+++ b/src/lib/deskflow/ClientApp.h
@@ -99,8 +99,8 @@ public:
 private:
   ISocketFactory *getSocketFactory() const;
 
-  Client *m_client;
-  deskflow::Screen *m_clientScreen;
-  NetworkAddress *m_serverAddress;
+  Client *m_client = nullptr;
+  deskflow::Screen *m_clientScreen = nullptr;
+  NetworkAddress *m_serverAddress = nullptr;
   size_t m_lastServerAddressIndex = 0;
 };
diff --git a/src/lib/deskflow/Clipboard.cpp b/src/lib/deskflow/Clipboard.cpp
index f14792eda..5d62f9fb2 100644
--- a/src/lib/deskflow/Clipboard.cpp
+++ b/src/lib/deskflow/Clipboard.cpp
@@ -12,7 +12,7 @@
 // Clipboard
 //
 
-Clipboard::Clipboard() : m_open(false), m_owner(false)
+Clipboard::Clipboard()
 {
   open(0);
   empty();
diff --git a/src/lib/deskflow/Clipboard.h b/src/lib/deskflow/Clipboard.h
index a1055e30b..f200d83eb 100644
--- a/src/lib/deskflow/Clipboard.h
+++ b/src/lib/deskflow/Clipboard.h
@@ -52,10 +52,10 @@ public:
   std::string get(EFormat) const override;
 
 private:
-  mutable bool m_open;
+  mutable bool m_open = false;
   mutable Time m_time;
-  bool m_owner;
+  bool m_owner = false;
   Time m_timeOwned;
-  bool m_added[kNumFormats];
-  std::string m_data[kNumFormats];
+  bool m_added[kNumFormats] = {false, false, false};
+  std::string m_data[kNumFormats] = {"", "", ""};
 };
diff --git a/src/lib/deskflow/PacketStreamFilter.cpp b/src/lib/deskflow/PacketStreamFilter.cpp
index 4f5abf9af..053801923 100644
--- a/src/lib/deskflow/PacketStreamFilter.cpp
+++ b/src/lib/deskflow/PacketStreamFilter.cpp
@@ -20,8 +20,6 @@
 
 PacketStreamFilter::PacketStreamFilter(IEventQueue *events, deskflow::IStream *stream, bool adoptStream)
     : StreamFilter(events, stream, adoptStream),
-      m_size(0),
-      m_inputShutdown(false),
       m_events(events)
 {
   // do nothing
diff --git a/src/lib/deskflow/PacketStreamFilter.h b/src/lib/deskflow/PacketStreamFilter.h
index 4aca91fb5..6ed715cee 100644
--- a/src/lib/deskflow/PacketStreamFilter.h
+++ b/src/lib/deskflow/PacketStreamFilter.h
@@ -42,8 +42,8 @@ private:
 
 private:
   Mutex m_mutex;
-  uint32_t m_size;
+  uint32_t m_size = 0;
   StreamBuffer m_buffer;
-  bool m_inputShutdown;
-  IEventQueue *m_events;
+  bool m_inputShutdown = false;
+  IEventQueue *m_events = nullptr;
 };
diff --git a/src/lib/deskflow/Screen.cpp b/src/lib/deskflow/Screen.cpp
index a3e23b493..ea1cfe058 100644
--- a/src/lib/deskflow/Screen.cpp
+++ b/src/lib/deskflow/Screen.cpp
@@ -22,11 +22,8 @@ namespace deskflow {
 Screen::Screen(IPlatformScreen *platformScreen, IEventQueue *events)
     : m_screen(platformScreen),
       m_isPrimary(platformScreen->isPrimary()),
-      m_enabled(false),
       m_entered(m_isPrimary),
-      m_fakeInput(false),
-      m_events(events),
-      m_mock(false)
+      m_events(events)
 {
   assert(m_screen != nullptr);
 
@@ -38,9 +35,6 @@ Screen::Screen(IPlatformScreen *platformScreen, IEventQueue *events)
 
 Screen::~Screen()
 {
-  if (m_mock) {
-    return;
-  }
 
   if (m_enabled) {
     disable();
diff --git a/src/lib/deskflow/Screen.h b/src/lib/deskflow/Screen.h
index 7de62a069..75d68eeb2 100644
--- a/src/lib/deskflow/Screen.h
+++ b/src/lib/deskflow/Screen.h
@@ -292,27 +292,25 @@ protected:
 
 private:
   // our platform dependent screen
-  IPlatformScreen *m_screen;
+  IPlatformScreen *m_screen = nullptr;
 
   // true if screen is being used as a primary screen, false otherwise
-  bool m_isPrimary;
+  bool m_isPrimary = false;
 
   // true if screen is enabled
-  bool m_enabled;
+  bool m_enabled = false;
 
   // true if the cursor is on this screen
-  bool m_entered;
+  bool m_entered = false;
 
   // note toggle keys that toggles on up/down (false) or on
   // transition (true)
   KeyModifierMask m_halfDuplex;
 
   // true if we're faking input on a primary screen
-  bool m_fakeInput;
+  bool m_fakeInput = false;
 
-  IEventQueue *m_events;
-
-  bool m_mock;
+  IEventQueue *m_events = nullptr;
 };
 
 } // namespace deskflow
diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index e96e5b81d..79c011811 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -68,16 +68,9 @@ using namespace deskflow::server;
 // ServerApp
 //
 
-ServerApp::ServerApp(IEventQueue *events)
-    : App(events, new deskflow::ServerArgs()),
-      m_server(nullptr),
-      m_serverState(kUninitialized),
-      m_serverScreen(nullptr),
-      m_primaryClient(nullptr),
-      m_listener(nullptr),
-      m_timer(nullptr),
-      m_deskflowAddress(nullptr)
+ServerApp::ServerApp(IEventQueue *events) : App(events, new deskflow::ServerArgs())
 {
+  // do nothing
 }
 
 void ServerApp::parseArgs(int argc, const char *const *argv)
diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h
index c43f36a3a..565bf533f 100644
--- a/src/lib/deskflow/ServerApp.h
+++ b/src/lib/deskflow/ServerApp.h
@@ -128,11 +128,11 @@ private:
   ISocketFactory *getSocketFactory() const;
   NetworkAddress getAddress(const NetworkAddress &address) const;
 
-  Server *m_server;
-  EServerState m_serverState;
-  deskflow::Screen *m_serverScreen;
-  PrimaryClient *m_primaryClient;
-  ClientListener *m_listener;
-  EventQueueTimer *m_timer;
-  NetworkAddress *m_deskflowAddress;
+  Server *m_server = nullptr;
+  EServerState m_serverState = EServerState::kUninitialized;
+  deskflow::Screen *m_serverScreen = nullptr;
+  PrimaryClient *m_primaryClient = nullptr;
+  ClientListener *m_listener = nullptr;
+  EventQueueTimer *m_timer = nullptr;
+  NetworkAddress *m_deskflowAddress = nullptr;
 };
diff --git a/src/lib/gui/DataDownloader.cpp b/src/lib/gui/DataDownloader.cpp
index 8fdb618fd..6dcd95c7d 100644
--- a/src/lib/gui/DataDownloader.cpp
+++ b/src/lib/gui/DataDownloader.cpp
@@ -6,7 +6,7 @@
 
 #include "DataDownloader.h"
 
-DataDownloader::DataDownloader(QObject *parent) : QObject(parent), m_pReply(nullptr), m_IsFinished(false)
+DataDownloader::DataDownloader(QObject *parent) : QObject(parent)
 {
   connect(&m_NetworkManager, &QNetworkAccessManager::finished, this, &DataDownloader::complete);
 }
diff --git a/src/lib/gui/DataDownloader.h b/src/lib/gui/DataDownloader.h
index 1cd868735..9b9b58ff4 100644
--- a/src/lib/gui/DataDownloader.h
+++ b/src/lib/gui/DataDownloader.h
@@ -37,6 +37,6 @@ private slots:
 private:
   QNetworkAccessManager m_NetworkManager;
   QByteArray m_Data;
-  QNetworkReply *m_pReply;
-  bool m_IsFinished;
+  QNetworkReply *m_pReply = nullptr;
+  bool m_IsFinished = false;
 };
diff --git a/src/lib/gui/Hotkey.cpp b/src/lib/gui/Hotkey.cpp
index a7e5980b3..3ec948b11 100644
--- a/src/lib/gui/Hotkey.cpp
+++ b/src/lib/gui/Hotkey.cpp
@@ -10,11 +10,6 @@
 
 #include <QSettings>
 
-Hotkey::Hotkey() : m_keySequence{}, m_actions{}
-{
-  // do nothing
-}
-
 QString Hotkey::text() const
 {
   return m_keySequence.isMouseButton() ? kMousebutton.arg(m_keySequence.toString())
diff --git a/src/lib/gui/Hotkey.h b/src/lib/gui/Hotkey.h
index c6ca4b235..16fac61c4 100644
--- a/src/lib/gui/Hotkey.h
+++ b/src/lib/gui/Hotkey.h
@@ -26,7 +26,7 @@ class Hotkey
   friend QTextStream &operator<<(QTextStream &outStream, const Hotkey &hotkey);
 
 public:
-  Hotkey();
+  Hotkey() = default;
 
 public:
   QString text() const;
@@ -59,8 +59,8 @@ protected:
   }
 
 private:
-  KeySequence m_keySequence;
-  ActionList m_actions;
+  KeySequence m_keySequence = {};
+  ActionList m_actions = {};
   inline static const QString kSectionActions = QStringLiteral("actions");
   inline static const QString kMousebutton = QStringLiteral("mousebutton(%1)");
   inline static const QString kKeystroke = QStringLiteral("keystroke(%1)");
diff --git a/src/lib/gui/KeySequence.cpp b/src/lib/gui/KeySequence.cpp
index 29451cdd8..6ce3b47a5 100644
--- a/src/lib/gui/KeySequence.cpp
+++ b/src/lib/gui/KeySequence.cpp
@@ -66,10 +66,6 @@ static const struct
     {0, nullptr}
 };
 
-KeySequence::KeySequence() : m_Sequence(), m_Modifiers(0), m_IsValid(false)
-{
-}
-
 bool KeySequence::isMouseButton() const
 {
   return !m_Sequence.isEmpty() && m_Sequence.last() < Qt::Key_Space;
diff --git a/src/lib/gui/KeySequence.h b/src/lib/gui/KeySequence.h
index 10a3dda16..79d340d7f 100644
--- a/src/lib/gui/KeySequence.h
+++ b/src/lib/gui/KeySequence.h
@@ -15,7 +15,7 @@ class QSettings;
 class KeySequence
 {
 public:
-  KeySequence();
+  KeySequence() = default;
 
 public:
   QString toString() const;
@@ -54,9 +54,9 @@ private:
   }
 
 private:
-  QList<int> m_Sequence;
-  int m_Modifiers;
-  bool m_IsValid;
+  QList<int> m_Sequence = {};
+  int m_Modifiers = 0;
+  bool m_IsValid = false;
 
   inline static const int kStrSize = 4;
   inline static const int kBase = 16;
diff --git a/src/lib/gui/ServerConfig.cpp b/src/lib/gui/ServerConfig.cpp
index c676f84f0..f414ad306 100644
--- a/src/lib/gui/ServerConfig.cpp
+++ b/src/lib/gui/ServerConfig.cpp
@@ -40,8 +40,7 @@ ServerConfig::ServerConfig(MainWindow &mainWindow, int columns, int rows)
     : m_pMainWindow(&mainWindow),
       m_Screens(columns),
       m_Columns(columns),
-      m_Rows(rows),
-      m_ClipboardSharingSize(defaultClipboardSharingSize())
+      m_Rows(rows)
 {
   recall();
 }
diff --git a/src/lib/gui/ServerConfig.h b/src/lib/gui/ServerConfig.h
index fe14a3b3a..f02336ba5 100644
--- a/src/lib/gui/ServerConfig.h
+++ b/src/lib/gui/ServerConfig.h
@@ -280,7 +280,7 @@ private:
   ScreenList m_Screens;
   int m_Columns;
   int m_Rows;
-  size_t m_ClipboardSharingSize;
+  size_t m_ClipboardSharingSize = defaultClipboardSharingSize();
 };
 
 QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config);
diff --git a/src/lib/gui/dialogs/AddClientDialog.cpp b/src/lib/gui/dialogs/AddClientDialog.cpp
index bee8b8274..59421375e 100644
--- a/src/lib/gui/dialogs/AddClientDialog.cpp
+++ b/src/lib/gui/dialogs/AddClientDialog.cpp
@@ -12,8 +12,7 @@
 
 AddClientDialog::AddClientDialog(const QString &clientName, QWidget *parent)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-      ui{std::make_unique<Ui::AddClientDialog>()},
-      m_AddResult(kAddClientIgnore)
+      ui{std::make_unique<Ui::AddClientDialog>()}
 {
   ui->setupUi(this);
 
diff --git a/src/lib/gui/dialogs/AddClientDialog.h b/src/lib/gui/dialogs/AddClientDialog.h
index 7ab746e8e..a074f2608 100644
--- a/src/lib/gui/dialogs/AddClientDialog.h
+++ b/src/lib/gui/dialogs/AddClientDialog.h
@@ -51,5 +51,5 @@ private:
   QPushButton *m_pButtonRight;
   QPushButton *m_pButtonDown;
   QLabel *m_pLabelCenter;
-  int m_AddResult;
+  int m_AddResult = kAddClientIgnore;
 };
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp
index c35b29379..c05223235 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.cpp
+++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp
@@ -29,8 +29,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
       m_OriginalServerConfigIsExternal(config.useExternalConfig()),
       m_OriginalServerConfigUsesExternalFile(config.configFile()),
       m_ServerConfig(config),
-      m_ScreenSetupModel(serverConfig().screens(), serverConfig().numColumns(), serverConfig().numRows()),
-      m_Message("")
+      m_ScreenSetupModel(serverConfig().screens(), serverConfig().numColumns(), serverConfig().numRows())
 {
   ui->setupUi(this);
 
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h
index 12dd03f13..1ce275c44 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.h
+++ b/src/lib/gui/dialogs/ServerConfigDialog.h
@@ -100,7 +100,7 @@ private:
   bool m_OriginalServerConfigIsExternal;
   QString m_OriginalServerConfigUsesExternalFile;
   ScreenSetupModel m_ScreenSetupModel;
-  QString m_Message;
+  QString m_Message = "";
 
 private slots:
   void onChange();
diff --git a/src/lib/gui/widgets/KeySequenceWidget.cpp b/src/lib/gui/widgets/KeySequenceWidget.cpp
index eef0dd601..b8d9a8b59 100644
--- a/src/lib/gui/widgets/KeySequenceWidget.cpp
+++ b/src/lib/gui/widgets/KeySequenceWidget.cpp
@@ -13,12 +13,7 @@
 KeySequenceWidget::KeySequenceWidget(QWidget *parent, const KeySequence &seq)
     : QPushButton(parent),
       m_KeySequence(seq),
-      m_BackupSequence(seq),
-      m_Status(Stopped),
-      m_MousePrefix("mousebutton("),
-      m_MousePostfix(")"),
-      m_KeyPrefix("keystroke("),
-      m_KeyPostfix(")")
+      m_BackupSequence(seq)
 {
   setFocusPolicy(Qt::NoFocus);
   updateOutput();
diff --git a/src/lib/gui/widgets/KeySequenceWidget.h b/src/lib/gui/widgets/KeySequenceWidget.h
index 8c90ef95e..7de4e80e8 100644
--- a/src/lib/gui/widgets/KeySequenceWidget.h
+++ b/src/lib/gui/widgets/KeySequenceWidget.h
@@ -98,9 +98,9 @@ private:
 private:
   KeySequence m_KeySequence;
   KeySequence m_BackupSequence;
-  Status m_Status;
-  QString m_MousePrefix;
-  QString m_MousePostfix;
-  QString m_KeyPrefix;
-  QString m_KeyPostfix;
+  Status m_Status = Status::Stopped;
+  QString m_MousePrefix = QStringLiteral("mousebutton(");
+  QString m_MousePostfix = QStringLiteral(")");
+  QString m_KeyPrefix = QStringLiteral("keystroke(");
+  QString m_KeyPostfix = QStringLiteral(")");
 };
diff --git a/src/lib/io/StreamBuffer.cpp b/src/lib/io/StreamBuffer.cpp
index b5d75efe5..7b4fb4b72 100644
--- a/src/lib/io/StreamBuffer.cpp
+++ b/src/lib/io/StreamBuffer.cpp
@@ -14,11 +14,6 @@
 
 const uint32_t StreamBuffer::kChunkSize = 4096;
 
-StreamBuffer::StreamBuffer() : m_size(0), m_headUsed(0)
-{
-  // do nothing
-}
-
 const void *StreamBuffer::peek(uint32_t n)
 {
   assert(n <= m_size);
diff --git a/src/lib/io/StreamBuffer.h b/src/lib/io/StreamBuffer.h
index 70f6bc299..80eab822e 100644
--- a/src/lib/io/StreamBuffer.h
+++ b/src/lib/io/StreamBuffer.h
@@ -19,7 +19,7 @@ This class maintains a FIFO (first-in, last-out) buffer of bytes.
 class StreamBuffer
 {
 public:
-  StreamBuffer();
+  StreamBuffer() = default;
   ~StreamBuffer() = default;
 
   //! @name manipulators
@@ -65,6 +65,6 @@ private:
   using ChunkList = std::list<Chunk>;
 
   ChunkList m_chunks;
-  uint32_t m_size;
-  uint32_t m_headUsed;
+  uint32_t m_size = 0;
+  uint32_t m_headUsed = 0;
 };
diff --git a/src/lib/mt/Thread.cpp b/src/lib/mt/Thread.cpp
index ab2a3dd98..411f5236c 100644
--- a/src/lib/mt/Thread.cpp
+++ b/src/lib/mt/Thread.cpp
@@ -28,14 +28,14 @@ Thread::Thread(IJob *job)
   }
 }
 
-Thread::Thread(const Thread &thread)
+Thread::Thread(const Thread &thread) : m_thread{ARCH->copyThread(thread.m_thread)}
 {
-  m_thread = ARCH->copyThread(thread.m_thread);
+  // do nothing
 }
 
-Thread::Thread(ArchThread adoptedThread)
+Thread::Thread(ArchThread adoptedThread) : m_thread{adoptedThread}
 {
-  m_thread = adoptedThread;
+  // do nothing
 }
 
 Thread::~Thread()
diff --git a/src/lib/mt/Thread.h b/src/lib/mt/Thread.h
index 2593e9e34..3b667a8e4 100644
--- a/src/lib/mt/Thread.h
+++ b/src/lib/mt/Thread.h
@@ -195,5 +195,5 @@ private:
   static void *threadFunc(void *);
 
 private:
-  ArchThread m_thread;
+  ArchThread m_thread = nullptr;
 };
diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index ac0838a24..815812a85 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -60,9 +60,6 @@ SecureSocket::SecureSocket(
     SecurityLevel securityLevel
 )
     : TCPSocket(events, socketMultiplexer, family),
-      m_ssl(nullptr),
-      m_secureReady(false),
-      m_fatal(false),
       m_securityLevel{securityLevel}
 {
   // do nothing
@@ -72,9 +69,6 @@ SecureSocket::SecureSocket(
     IEventQueue *events, SocketMultiplexer *socketMultiplexer, ArchSocket socket, SecurityLevel securityLevel
 )
     : TCPSocket(events, socketMultiplexer, socket),
-      m_ssl(nullptr),
-      m_secureReady(false),
-      m_fatal(false),
       m_securityLevel{securityLevel}
 {
   // do nothing
diff --git a/src/lib/net/SecureSocket.h b/src/lib/net/SecureSocket.h
index eb4fb884a..01bf70c41 100644
--- a/src/lib/net/SecureSocket.h
+++ b/src/lib/net/SecureSocket.h
@@ -91,8 +91,8 @@ private:
   // by it.
   std::mutex ssl_mutex_;
 
-  Ssl *m_ssl;
-  bool m_secureReady;
-  bool m_fatal;
+  Ssl *m_ssl = nullptr;
+  bool m_secureReady = false;
+  bool m_fatal = false;
   SecurityLevel m_securityLevel = SecurityLevel::Encrypted;
 };
diff --git a/src/lib/net/SocketMultiplexer.cpp b/src/lib/net/SocketMultiplexer.cpp
index dacac4615..dc9beb80e 100644
--- a/src/lib/net/SocketMultiplexer.cpp
+++ b/src/lib/net/SocketMultiplexer.cpp
@@ -25,13 +25,9 @@
 
 SocketMultiplexer::SocketMultiplexer()
     : m_mutex(new Mutex),
-      m_thread(nullptr),
-      m_update(false),
       m_jobsReady(new CondVar<bool>(m_mutex, false)),
       m_jobListLock(new CondVar<bool>(m_mutex, false)),
-      m_jobListLockLocked(new CondVar<bool>(m_mutex, false)),
-      m_jobListLocker(nullptr),
-      m_jobListLockLocker(nullptr)
+      m_jobListLockLocked(new CondVar<bool>(m_mutex, false))
 {
   // this pointer just has to be unique and not nullptr.  it will
   // never be dereferenced.  it's used to identify cursor nodes
diff --git a/src/lib/net/SocketMultiplexer.h b/src/lib/net/SocketMultiplexer.h
index 761b2d9be..8f62cca25 100644
--- a/src/lib/net/SocketMultiplexer.h
+++ b/src/lib/net/SocketMultiplexer.h
@@ -89,16 +89,16 @@ private:
   void unlockJobList();
 
 private:
-  Mutex *m_mutex;
-  Thread *m_thread;
-  bool m_update;
-  CondVar<bool> *m_jobsReady;
-  CondVar<bool> *m_jobListLock;
-  CondVar<bool> *m_jobListLockLocked;
-  Thread *m_jobListLocker;
-  Thread *m_jobListLockLocker;
+  Mutex *m_mutex = nullptr;
+  Thread *m_thread = nullptr;
+  bool m_update = false;
+  CondVar<bool> *m_jobsReady = nullptr;
+  CondVar<bool> *m_jobListLock = nullptr;
+  CondVar<bool> *m_jobListLockLocked = nullptr;
+  Thread *m_jobListLocker = nullptr;
+  Thread *m_jobListLockLocker = nullptr;
 
-  SocketJobs m_socketJobs;
-  SocketJobMap m_socketJobMap;
-  ISocketMultiplexerJob *m_cursorMark;
+  SocketJobs m_socketJobs = {};
+  SocketJobMap m_socketJobMap = {};
+  ISocketMultiplexerJob *m_cursorMark = nullptr;
 };
diff --git a/src/lib/net/TCPListenSocket.h b/src/lib/net/TCPListenSocket.h
index c7b4d2b2b..7a97bd9c1 100644
--- a/src/lib/net/TCPListenSocket.h
+++ b/src/lib/net/TCPListenSocket.h
@@ -46,7 +46,7 @@ public:
 
 protected:
   ArchSocket m_socket;
-  Mutex *m_mutex;
+  Mutex *m_mutex = nullptr;
   IEventQueue *m_events;
   SocketMultiplexer *m_socketMultiplexer;
 };
diff --git a/src/lib/net/TCPSocket.cpp b/src/lib/net/TCPSocket.cpp
index 60d7924d1..918555570 100644
--- a/src/lib/net/TCPSocket.cpp
+++ b/src/lib/net/TCPSocket.cpp
@@ -31,7 +31,6 @@ static const std::size_t MAX_INPUT_BUFFER_SIZE = 1024 * 1024;
 TCPSocket::TCPSocket(IEventQueue *events, SocketMultiplexer *socketMultiplexer, IArchNetwork::EAddressFamily family)
     : IDataSocket(events),
       m_events(events),
-      m_mutex(),
       m_flushed(&m_mutex, true),
       m_socketMultiplexer(socketMultiplexer)
 {
@@ -49,7 +48,6 @@ TCPSocket::TCPSocket(IEventQueue *events, SocketMultiplexer *socketMultiplexer,
 TCPSocket::TCPSocket(IEventQueue *events, SocketMultiplexer *socketMultiplexer, ArchSocket socket)
     : IDataSocket(events),
       m_events(events),
-      m_mutex(),
       m_socket(socket),
       m_flushed(&m_mutex, true),
       m_socketMultiplexer(socketMultiplexer)
diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp
index 07470c9f6..2db217f3f 100644
--- a/src/lib/platform/XWindowsClipboard.cpp
+++ b/src/lib/platform/XWindowsClipboard.cpp
@@ -31,12 +31,7 @@
 XWindowsClipboard::XWindowsClipboard(Display *display, Window window, ClipboardID id)
     : m_display(display),
       m_window(window),
-      m_id(id),
-      m_open(false),
-      m_time(0),
-      m_owner(false),
-      m_timeOwned(0),
-      m_timeLost(0)
+      m_id(id)
 {
   // get some atoms
   m_atomTargets = XInternAtom(m_display, "TARGETS", False);
@@ -1373,12 +1368,8 @@ XWindowsClipboard::Reply::Reply(Window requestor, Atom target, ::Time time)
       m_target(target),
       m_time(time),
       m_property(None),
-      m_replied(false),
-      m_done(false),
-      m_data(),
       m_type(None),
-      m_format(32),
-      m_ptr(0)
+      m_format(32)
 {
   // do nothing
 }
diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h
index a7bafac17..eb191e1bc 100644
--- a/src/lib/platform/XWindowsClipboard.h
+++ b/src/lib/platform/XWindowsClipboard.h
@@ -235,10 +235,10 @@ protected:
     Atom m_property;
 
     // true iff we've sent the notification for this reply
-    bool m_replied;
+    bool m_replied = false;
 
     // true iff the reply has sent its last message
-    bool m_done;
+    bool m_done = false;
 
     // the data to send and its type and format
     std::string m_data;
@@ -246,7 +246,7 @@ protected:
     int m_format;
 
     // index of next byte in m_data to send
-    uint32_t m_ptr;
+    uint32_t m_ptr = 0;
   };
   using ReplyList = std::list<Reply *>;
   using ReplyMap = std::map<Window, ReplyList>;
@@ -287,11 +287,11 @@ private:
   Window m_window;
   ClipboardID m_id;
   Atom m_selection;
-  mutable bool m_open;
-  mutable Time m_time;
-  bool m_owner;
-  mutable Time m_timeOwned;
-  Time m_timeLost;
+  mutable bool m_open = false;
+  mutable Time m_time = 0;
+  bool m_owner = false;
+  mutable Time m_timeOwned = 0;
+  Time m_timeLost = 0;
 
   // true iff open and clipboard owned by a motif app
   mutable bool m_motif;
diff --git a/src/lib/platform/XWindowsEventQueueBuffer.cpp b/src/lib/platform/XWindowsEventQueueBuffer.cpp
index 942034fca..36732c7c9 100644
--- a/src/lib/platform/XWindowsEventQueueBuffer.cpp
+++ b/src/lib/platform/XWindowsEventQueueBuffer.cpp
@@ -34,8 +34,7 @@ class EventQueueTimer
 XWindowsEventQueueBuffer::XWindowsEventQueueBuffer(Display *display, Window window, IEventQueue *events)
     : m_events(events),
       m_display(display),
-      m_window(window),
-      m_waiting(false)
+      m_window(window)
 {
   assert(m_display != nullptr);
   assert(m_window != None);
diff --git a/src/lib/platform/XWindowsEventQueueBuffer.h b/src/lib/platform/XWindowsEventQueueBuffer.h
index e1387aafb..94d1f14c1 100644
--- a/src/lib/platform/XWindowsEventQueueBuffer.h
+++ b/src/lib/platform/XWindowsEventQueueBuffer.h
@@ -57,7 +57,7 @@ private:
   Atom m_userEvent;
   XEvent m_event;
   EventList m_postedEvents;
-  bool m_waiting;
+  bool m_waiting = false;
   int m_pipefd[2];
   IEventQueue *m_events;
 };
diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h
index 095369a7b..59a6c376f 100644
--- a/src/lib/platform/XWindowsKeyState.h
+++ b/src/lib/platform/XWindowsKeyState.h
@@ -146,7 +146,7 @@ private:
   NonXKBModifierMap m_lastGoodNonXKBModifiers;
 
   // X modifier (bit number) to deskflow modifier (mask) mapping
-  KeyModifierMaskList m_modifierFromX;
+  KeyModifierMaskList m_modifierFromX = {};
 
   // deskflow modifier (mask) to X modifier (mask)
   KeyModifierToXMask m_modifierToX;
diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
index 1afdfa703..445b85bfa 100644
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -92,32 +92,7 @@ XWindowsScreen::XWindowsScreen(
     : PlatformScreen(events, scrollDirection),
       m_isPrimary(isPrimary),
       m_mouseScrollDelta(mouseScrollDelta),
-      m_display(nullptr),
-      m_root(None),
-      m_window(None),
       m_isOnScreen(m_isPrimary),
-      m_x(0),
-      m_y(0),
-      m_w(0),
-      m_h(0),
-      m_xCenter(0),
-      m_yCenter(0),
-      m_xCursor(0),
-      m_yCursor(0),
-      m_keyState(nullptr),
-      m_lastFocus(None),
-      m_lastFocusRevert(RevertToNone),
-      m_im(nullptr),
-      m_ic(nullptr),
-      m_lastKeycode(0),
-      m_sequenceNumber(0),
-      m_screensaver(nullptr),
-      m_screensaverNotify(false),
-      m_xtestIsXineramaUnaware(true),
-      m_preserveFocus(false),
-      m_xkb(false),
-      m_xi2detected(false),
-      m_xrandr(false),
       m_events(events)
 {
   assert(s_screen == nullptr);
diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h
index 2ded3f631..9dd537057 100644
--- a/src/lib/platform/XWindowsScreen.h
+++ b/src/lib/platform/XWindowsScreen.h
@@ -172,27 +172,27 @@ private:
   bool m_isPrimary;
   int m_mouseScrollDelta;
 
-  Display *m_display;
-  Window m_root;
-  Window m_window;
+  Display *m_display = nullptr;
+  Window m_root = None;
+  Window m_window = None;
 
   // true if mouse has entered the screen
   bool m_isOnScreen;
 
   // screen shape stuff
-  int32_t m_x;
-  int32_t m_y;
-  int32_t m_w;
-  int32_t m_h;
-  int32_t m_xCenter;
-  int32_t m_yCenter;
+  int32_t m_x = 0;
+  int32_t m_y = 0;
+  int32_t m_w = 0;
+  int32_t m_h = 0;
+  int32_t m_xCenter = 0;
+  int32_t m_yCenter = 0;
 
   // last mouse position
-  int32_t m_xCursor;
-  int32_t m_yCursor;
+  int32_t m_xCursor = 0;
+  int32_t m_yCursor = 0;
 
   // keyboard stuff
-  XWindowsKeyState *m_keyState;
+  XWindowsKeyState *m_keyState = nullptr;
 
   // hot key stuff
   HotKeyMap m_hotKeys;
@@ -200,22 +200,22 @@ private:
   HotKeyToIDMap m_hotKeyToIDMap;
 
   // input focus stuff
-  Window m_lastFocus;
-  int m_lastFocusRevert;
+  Window m_lastFocus = None;
+  int m_lastFocusRevert = RevertToNone;
 
   // input method stuff
-  XIM m_im;
-  XIC m_ic;
-  KeyCode m_lastKeycode;
+  XIM m_im = nullptr;
+  XIC m_ic = nullptr;
+  KeyCode m_lastKeycode = 0;
   FilteredKeycodes m_filtered;
 
   // clipboards
   XWindowsClipboard *m_clipboard[kClipboardEnd];
-  uint32_t m_sequenceNumber;
+  uint32_t m_sequenceNumber = 0;
 
   // screen saver stuff
-  XWindowsScreenSaver *m_screensaver;
-  bool m_screensaverNotify;
+  XWindowsScreenSaver *m_screensaver = nullptr;
+  bool m_screensaverNotify = false;
 
   // logical to physical button mapping.  m_buttons[i] gives the
   // physical button for logical button i+1.
@@ -228,24 +228,24 @@ private:
   // to fake a mouse motion under xinerama may behave strangely,
   // especially if screen 0 is not at 0,0 or if faking a motion on
   // a screen other than screen 0.
-  bool m_xtestIsXineramaUnaware;
+  bool m_xtestIsXineramaUnaware = true;
   bool m_xinerama;
 
   // stuff to work around lost focus issues on certain systems
   // (ie: a MythTV front-end).
-  bool m_preserveFocus;
+  bool m_preserveFocus = false;
 
   // XKB extension stuff
-  bool m_xkb;
+  bool m_xkb = false;
   int m_xkbEventBase;
 
-  bool m_xi2detected;
+  bool m_xi2detected = false;
 
   // XRandR extension stuff
-  bool m_xrandr;
+  bool m_xrandr = false;
   int m_xrandrEventBase;
 
-  IEventQueue *m_events;
+  IEventQueue *m_events = nullptr;
   deskflow::KeyMap m_keyMap;
 
   // pointer to (singleton) screen.  this is only needed by
diff --git a/src/lib/platform/XWindowsScreenSaver.cpp b/src/lib/platform/XWindowsScreenSaver.cpp
index a0f2be6ee..fe4d838ee 100644
--- a/src/lib/platform/XWindowsScreenSaver.cpp
+++ b/src/lib/platform/XWindowsScreenSaver.cpp
@@ -52,13 +52,6 @@ XWindowsScreenSaver::XWindowsScreenSaver(Display *display, Window window, void *
     : m_display(display),
       m_xscreensaverSink(window),
       m_eventTarget(eventTarget),
-      m_xscreensaver(None),
-      m_xscreensaverActive(false),
-      m_dpms(false),
-      m_disabled(false),
-      m_suppressDisable(false),
-      m_disableTimer(nullptr),
-      m_disablePos(0),
       m_events(events)
 {
   // get atoms
diff --git a/src/lib/platform/XWindowsScreenSaver.h b/src/lib/platform/XWindowsScreenSaver.h
index 713779a3a..ac717e937 100644
--- a/src/lib/platform/XWindowsScreenSaver.h
+++ b/src/lib/platform/XWindowsScreenSaver.h
@@ -118,10 +118,10 @@ private:
   void *m_eventTarget;
 
   // xscreensaver's window
-  Window m_xscreensaver;
+  Window m_xscreensaver = None;
 
   // xscreensaver activation state
-  bool m_xscreensaverActive;
+  bool m_xscreensaverActive = false;
 
   // old event mask on root window
   long m_rootEventMask;
@@ -142,24 +142,24 @@ private:
   int m_allowExposures;
 
   // DPMS screen saver settings
-  bool m_dpms;
+  bool m_dpms = false;
   bool m_dpmsEnabled;
 
   // true iff the client wants the screen saver suppressed
-  bool m_disabled;
+  bool m_disabled = false;
 
   // true iff we're ignoring m_disabled.  this is true, for example,
   // when the client has called activate() and so presumably wants
   // to activate the screen saver even if disabled.
-  bool m_suppressDisable;
+  bool m_suppressDisable = false;
 
   // the disable timer (nullptr if not installed)
-  EventQueueTimer *m_disableTimer;
+  EventQueueTimer *m_disableTimer = nullptr;
 
   // fake mouse motion position for suppressing the screen saver.
   // xscreensaver since 2.21 requires the mouse to move more than 10
   // pixels to be considered significant.
-  int32_t m_disablePos;
+  int32_t m_disablePos = 0;
 
-  IEventQueue *m_events;
+  IEventQueue *m_events = nullptr;
 };
diff --git a/src/lib/server/BaseClientProxy.cpp b/src/lib/server/BaseClientProxy.cpp
index 34f4fc132..8840f8eee 100644
--- a/src/lib/server/BaseClientProxy.cpp
+++ b/src/lib/server/BaseClientProxy.cpp
@@ -11,7 +11,7 @@
 // BaseClientProxy
 //
 
-BaseClientProxy::BaseClientProxy(const std::string &name) : m_name(name), m_x(0), m_y(0)
+BaseClientProxy::BaseClientProxy(const std::string &name) : m_name(name)
 {
   // do nothing
 }
diff --git a/src/lib/server/BaseClientProxy.h b/src/lib/server/BaseClientProxy.h
index d61e34642..66201d6ee 100644
--- a/src/lib/server/BaseClientProxy.h
+++ b/src/lib/server/BaseClientProxy.h
@@ -85,6 +85,6 @@ public:
 
 private:
   std::string m_name;
-  int32_t m_x;
-  int32_t m_y;
+  int32_t m_x = 0;
+  int32_t m_y = 0;
 };
diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp
index f72196ab6..c202bd585 100644
--- a/src/lib/server/ClientListener.cpp
+++ b/src/lib/server/ClientListener.cpp
@@ -28,7 +28,6 @@ ClientListener::ClientListener(
     const NetworkAddress &address, ISocketFactory *socketFactory, IEventQueue *events, SecurityLevel securityLevel
 )
     : m_socketFactory(socketFactory),
-      m_server(nullptr),
       m_events(events),
       m_securityLevel(securityLevel),
       m_address(address)
diff --git a/src/lib/server/ClientListener.h b/src/lib/server/ClientListener.h
index 197b56219..9e20b82d7 100644
--- a/src/lib/server/ClientListener.h
+++ b/src/lib/server/ClientListener.h
@@ -85,7 +85,7 @@ private:
   ISocketFactory *m_socketFactory;
   NewClients m_newClients;
   WaitingClients m_waitingClients;
-  Server *m_server;
+  Server *m_server = nullptr;
   IEventQueue *m_events;
   SecurityLevel m_securityLevel;
   ClientSockets m_clientSockets;
diff --git a/src/lib/server/ClientProxy1_0.cpp b/src/lib/server/ClientProxy1_0.cpp
index 5e835afcb..b72dc2e96 100644
--- a/src/lib/server/ClientProxy1_0.cpp
+++ b/src/lib/server/ClientProxy1_0.cpp
@@ -22,7 +22,6 @@
 
 ClientProxy1_0::ClientProxy1_0(const std::string &name, deskflow::IStream *stream, IEventQueue *events)
     : ClientProxy(name, stream),
-      m_heartbeatTimer(nullptr),
       m_parser(&ClientProxy1_0::parseHandshakeMessage),
       m_events(events)
 {
@@ -443,12 +442,3 @@ bool ClientProxy1_0::recvGrabClipboard()
 
   return true;
 }
-
-//
-// ClientProxy1_0::ClientClipboard
-//
-
-ClientProxy1_0::ClientClipboard::ClientClipboard() : m_clipboard(), m_sequenceNumber(0), m_dirty(true)
-{
-  // do nothing
-}
diff --git a/src/lib/server/ClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h
index 69937862f..f5d529aed 100644
--- a/src/lib/server/ClientProxy1_0.h
+++ b/src/lib/server/ClientProxy1_0.h
@@ -81,12 +81,12 @@ protected:
   struct ClientClipboard
   {
   public:
-    ClientClipboard();
+    ClientClipboard() = default;
 
   public:
     Clipboard m_clipboard;
-    uint32_t m_sequenceNumber;
-    bool m_dirty;
+    uint32_t m_sequenceNumber = 0;
+    bool m_dirty = true;
   };
 
   ClientClipboard m_clipboard[kClipboardEnd];
@@ -96,7 +96,7 @@ private:
 
   ClientInfo m_info;
   double m_heartbeatAlarm;
-  EventQueueTimer *m_heartbeatTimer;
+  EventQueueTimer *m_heartbeatTimer = nullptr;
   MessageParser m_parser;
   IEventQueue *m_events;
 };
diff --git a/src/lib/server/ClientProxy1_3.cpp b/src/lib/server/ClientProxy1_3.cpp
index 395c06850..88ee55754 100644
--- a/src/lib/server/ClientProxy1_3.cpp
+++ b/src/lib/server/ClientProxy1_3.cpp
@@ -21,8 +21,6 @@
 
 ClientProxy1_3::ClientProxy1_3(const std::string &name, deskflow::IStream *stream, IEventQueue *events)
     : ClientProxy1_2(name, stream, events),
-      m_keepAliveRate(kKeepAliveRate),
-      m_keepAliveTimer(nullptr),
       m_events(events)
 {
   setHeartbeatRate(kKeepAliveRate, kKeepAliveRate * kKeepAlivesUntilDeath);
diff --git a/src/lib/server/ClientProxy1_3.h b/src/lib/server/ClientProxy1_3.h
index 1f78e3fcc..0651923b0 100644
--- a/src/lib/server/ClientProxy1_3.h
+++ b/src/lib/server/ClientProxy1_3.h
@@ -37,7 +37,7 @@ protected:
   virtual void keepAlive();
 
 private:
-  double m_keepAliveRate;
-  EventQueueTimer *m_keepAliveTimer;
-  IEventQueue *m_events;
+  double m_keepAliveRate = kKeepAliveRate;
+  EventQueueTimer *m_keepAliveTimer = nullptr;
+  IEventQueue *m_events = nullptr;
 };
diff --git a/src/lib/server/ClientProxyUnknown.cpp b/src/lib/server/ClientProxyUnknown.cpp
index 8d87ac7a8..251c677b7 100644
--- a/src/lib/server/ClientProxyUnknown.cpp
+++ b/src/lib/server/ClientProxyUnknown.cpp
@@ -36,8 +36,6 @@
 
 ClientProxyUnknown::ClientProxyUnknown(deskflow::IStream *stream, double timeout, Server *server, IEventQueue *events)
     : m_stream(stream),
-      m_proxy(nullptr),
-      m_ready(false),
       m_server(server),
       m_events(events)
 {
diff --git a/src/lib/server/ClientProxyUnknown.h b/src/lib/server/ClientProxyUnknown.h
index a3370ae85..798021544 100644
--- a/src/lib/server/ClientProxyUnknown.h
+++ b/src/lib/server/ClientProxyUnknown.h
@@ -66,10 +66,10 @@ private:
   void handleReady(const Event &, void *);
 
 private:
-  deskflow::IStream *m_stream;
-  EventQueueTimer *m_timer;
-  ClientProxy *m_proxy;
-  bool m_ready;
-  Server *m_server;
-  IEventQueue *m_events;
+  deskflow::IStream *m_stream = nullptr;
+  EventQueueTimer *m_timer = nullptr;
+  ClientProxy *m_proxy = nullptr;
+  bool m_ready = false;
+  Server *m_server = nullptr;
+  IEventQueue *m_events = nullptr;
 };
diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp
index 1be7b9ec5..b6ac3a385 100644
--- a/src/lib/server/Config.cpp
+++ b/src/lib/server/Config.cpp
@@ -30,7 +30,7 @@ const auto kBarrierProtocolOption = "barrier";
 // Config
 //
 
-Config::Config(IEventQueue *events) : m_inputFilter(events), m_hasLockToScreenAction(false), m_events(events)
+Config::Config(IEventQueue *events) : m_inputFilter(events), m_events(events)
 {
   // do nothing
 }
diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h
index 4640902bc..8bd0abc83 100644
--- a/src/lib/server/Config.h
+++ b/src/lib/server/Config.h
@@ -146,10 +146,7 @@ public:
   class const_iterator : std::iterator_traits<Config>
   {
   public:
-    explicit const_iterator() : m_i()
-    {
-      // do nothing
-    }
+    explicit const_iterator() = default;
     explicit const_iterator(const internal_const_iterator &i) : m_i(i)
     {
       // do nothing
@@ -484,7 +481,7 @@ private:
   NetworkAddress m_deskflowAddress;
   ScreenOptions m_globalOptions;
   InputFilter m_inputFilter;
-  bool m_hasLockToScreenAction;
+  bool m_hasLockToScreenAction = false;
   IEventQueue *m_events;
 };
 
diff --git a/src/lib/server/InputFilter.cpp b/src/lib/server/InputFilter.cpp
index 0ebcc3fe0..c63472b91 100644
--- a/src/lib/server/InputFilter.cpp
+++ b/src/lib/server/InputFilter.cpp
@@ -31,8 +31,7 @@ void InputFilter::Condition::disablePrimary(PrimaryClient *)
 }
 
 InputFilter::KeystrokeCondition::KeystrokeCondition(IEventQueue *events, IPlatformScreen::KeyInfo *info)
-    : m_id(0),
-      m_key(info->m_key),
+    : m_key(info->m_key),
       m_mask(info->m_mask),
       m_events(events)
 {
@@ -40,8 +39,7 @@ InputFilter::KeystrokeCondition::KeystrokeCondition(IEventQueue *events, IPlatfo
 }
 
 InputFilter::KeystrokeCondition::KeystrokeCondition(IEventQueue *events, KeyID key, KeyModifierMask mask)
-    : m_id(0),
-      m_key(key),
+    : m_key(key),
       m_mask(mask),
       m_events(events)
 {
@@ -524,17 +522,12 @@ const char *InputFilter::MouseButtonAction::formatName() const
 // InputFilter::Rule
 //
 
-InputFilter::Rule::Rule() : m_condition(nullptr)
-{
-  // do nothing
-}
-
 InputFilter::Rule::Rule(Condition *adoptedCondition) : m_condition(adoptedCondition)
 {
   // do nothing
 }
 
-InputFilter::Rule::Rule(const Rule &rule) : m_condition(nullptr)
+InputFilter::Rule::Rule(const Rule &rule)
 {
   copy(rule);
 }
@@ -735,10 +728,7 @@ InputFilter::InputFilter(IEventQueue *events) : m_primaryClient(nullptr), m_even
   // do nothing
 }
 
-InputFilter::InputFilter(const InputFilter &x)
-    : m_ruleList(x.m_ruleList),
-      m_primaryClient(nullptr),
-      m_events(x.m_events)
+InputFilter::InputFilter(const InputFilter &x) : m_ruleList(x.m_ruleList), m_events(x.m_events)
 {
   setPrimaryClient(x.m_primaryClient);
 }
diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h
index 9f7a27944..d1ca6520f 100644
--- a/src/lib/server/InputFilter.h
+++ b/src/lib/server/InputFilter.h
@@ -66,7 +66,7 @@ public:
     void disablePrimary(PrimaryClient *) override;
 
   private:
-    uint32_t m_id;
+    uint32_t m_id = 0;
     KeyID m_key;
     KeyModifierMask m_mask;
     IEventQueue *m_events;
@@ -300,7 +300,7 @@ public:
   class Rule
   {
   public:
-    Rule();
+    Rule() = default;
     explicit Rule(Condition *adopted);
     Rule(const Rule &);
     ~Rule();
@@ -345,7 +345,7 @@ public:
   private:
     using ActionList = std::vector<Action *>;
 
-    Condition *m_condition;
+    Condition *m_condition = nullptr;
     ActionList m_activateActions;
     ActionList m_deactivateActions;
   };
@@ -391,6 +391,6 @@ private:
 
 private:
   RuleList m_ruleList;
-  PrimaryClient *m_primaryClient;
+  PrimaryClient *m_primaryClient = nullptr;
   IEventQueue *m_events;
 };
diff --git a/src/lib/server/PrimaryClient.cpp b/src/lib/server/PrimaryClient.cpp
index cc97b8672..b8dd8e6b8 100644
--- a/src/lib/server/PrimaryClient.cpp
+++ b/src/lib/server/PrimaryClient.cpp
@@ -17,8 +17,7 @@
 
 PrimaryClient::PrimaryClient(const std::string &name, deskflow::Screen *screen)
     : BaseClientProxy(name),
-      m_screen(screen),
-      m_fakeInputCount(0)
+      m_screen(screen)
 {
   // do nothing
 }
diff --git a/src/lib/server/PrimaryClient.h b/src/lib/server/PrimaryClient.h
index da60fa0ce..953193ae2 100644
--- a/src/lib/server/PrimaryClient.h
+++ b/src/lib/server/PrimaryClient.h
@@ -143,5 +143,5 @@ public:
 private:
   deskflow::Screen *m_screen;
   bool m_clipboardDirty[kClipboardEnd] = {false, false};
-  int32_t m_fakeInputCount;
+  int32_t m_fakeInputCount = 0;
 };
diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index 1d6fb5fef..2e96bd71d 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -46,33 +46,10 @@ Server::Server(
 )
     : m_primaryClient(primaryClient),
       m_active(primaryClient),
-      m_seqNum(0),
-      m_xDelta(0),
-      m_yDelta(0),
-      m_xDelta2(0),
-      m_yDelta2(0),
       m_config(&config),
       m_inputFilter(config.getInputFilter()),
-      m_activeSaver(nullptr),
-      m_switchDir(kNoDirection),
-      m_switchScreen(nullptr),
-      m_switchWaitDelay(0.0),
-      m_switchWaitTimer(nullptr),
-      m_switchTwoTapDelay(0.0),
-      m_switchTwoTapEngaged(false),
-      m_switchTwoTapArmed(false),
-      m_switchTwoTapZone(3),
-      m_switchNeedsShift(false),
-      m_switchNeedsControl(false),
-      m_switchNeedsAlt(false),
-      m_relativeMoves(false),
-      m_keyboardBroadcasting(false),
-      m_lockedToScreen(false),
       m_screen(screen),
       m_events(events),
-      m_disableLockToScreen(false),
-      m_enableClipboard(true),
-      m_maximumClipboardSize(INT_MAX),
       m_args(args)
 {
   // must have a primary client and it must have a canonical name
@@ -2078,15 +2055,6 @@ void Server::forceLeaveClient(const BaseClientProxy *client)
   m_primaryClient->reconfigure(getActivePrimarySides());
 }
 
-//
-// Server::ClipboardInfo
-//
-
-Server::ClipboardInfo::ClipboardInfo() : m_clipboard(), m_clipboardData(), m_clipboardOwner(), m_clipboardSeqNum(0)
-{
-  // do nothing
-}
-
 //
 // Server::LockCursorToScreenInfo
 //
diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index 6365c6148..26f15dd44 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -351,13 +351,13 @@ private:
   class ClipboardInfo
   {
   public:
-    ClipboardInfo();
+    ClipboardInfo() = default;
 
   public:
     Clipboard m_clipboard;
     std::string m_clipboardData;
     std::string m_clipboardOwner;
-    uint32_t m_clipboardSeqNum;
+    uint32_t m_clipboardSeqNum = 0;
   };
 
   // used in hello message sent to the client
@@ -380,7 +380,7 @@ private:
   BaseClientProxy *m_active;
 
   // the sequence number of enter messages
-  uint32_t m_seqNum;
+  uint32_t m_seqNum = 0;
 
   // current mouse position (in absolute screen coordinates) on
   // whichever screen is active
@@ -391,10 +391,10 @@ private:
   // on win32 which reports bogus mouse motion at the edge of
   // the screen when using low level hooks, synthesizing motion
   // in the opposite direction the mouse actually moved.
-  int32_t m_xDelta;
-  int32_t m_yDelta;
-  int32_t m_xDelta2;
-  int32_t m_yDelta2;
+  int32_t m_xDelta = 0;
+  int32_t m_yDelta = 0;
+  int32_t m_xDelta2 = 0;
+  int32_t m_yDelta2 = 0;
 
   // current configuration
   ServerConfig *m_config;
@@ -406,52 +406,52 @@ private:
   ClipboardInfo m_clipboards[kClipboardEnd];
 
   // state saved when screen saver activates
-  BaseClientProxy *m_activeSaver;
+  BaseClientProxy *m_activeSaver = nullptr;
   int32_t m_xSaver;
   int32_t m_ySaver;
 
   // common state for screen switch tests.  all tests are always
   // trying to reach the same screen in the same direction.
-  EDirection m_switchDir;
-  BaseClientProxy *m_switchScreen;
+  EDirection m_switchDir = EDirection::kNoDirection;
+  BaseClientProxy *m_switchScreen = nullptr;
 
   // state for delayed screen switching
-  double m_switchWaitDelay;
-  EventQueueTimer *m_switchWaitTimer;
+  double m_switchWaitDelay = 0.0;
+  EventQueueTimer *m_switchWaitTimer = nullptr;
   int32_t m_switchWaitX;
   int32_t m_switchWaitY;
 
   // state for double-tap screen switching
-  double m_switchTwoTapDelay;
+  double m_switchTwoTapDelay = 0.0;
   Stopwatch m_switchTwoTapTimer;
-  bool m_switchTwoTapEngaged;
-  bool m_switchTwoTapArmed;
-  int32_t m_switchTwoTapZone;
+  bool m_switchTwoTapEngaged = false;
+  bool m_switchTwoTapArmed = false;
+  int32_t m_switchTwoTapZone = 3;
 
   // modifiers needed before switching
-  bool m_switchNeedsShift;
-  bool m_switchNeedsControl;
-  bool m_switchNeedsAlt;
+  bool m_switchNeedsShift = false;
+  bool m_switchNeedsControl = false;
+  bool m_switchNeedsAlt = false;
 
   // relative mouse move option
-  bool m_relativeMoves;
+  bool m_relativeMoves = false;
 
   // flag whether or not we have broadcasting enabled and the screens to
   // which we should send broadcasted keys.
-  bool m_keyboardBroadcasting;
+  bool m_keyboardBroadcasting = false;
   std::string m_keyboardBroadcastingScreens;
 
   // screen locking (former scroll lock)
-  bool m_lockedToScreen;
+  bool m_lockedToScreen = false;
 
   // server screen
   deskflow::Screen *m_screen;
 
   IEventQueue *m_events;
 
-  bool m_disableLockToScreen;
-  bool m_enableClipboard;
-  size_t m_maximumClipboardSize;
+  bool m_disableLockToScreen = false;
+  bool m_enableClipboard = true;
+  size_t m_maximumClipboardSize = INT_MAX;
 
   ClientListener *m_clientListener;
   deskflow::ServerArgs m_args;