diff --git a/client/browseZeroConf/browseAvahi.cpp b/client/browseZeroConf/browseAvahi.cpp
index ac2068a1..13953b74 100644
--- a/client/browseZeroConf/browseAvahi.cpp
+++ b/client/browseZeroConf/browseAvahi.cpp
@@ -179,8 +179,8 @@ bool BrowseAvahi::browse(const std::string& serviceName, mDNSResult& result, int
             throw SnapException("BrowseAvahi - Failed to create client: " + std::string(avahi_strerror(error)));
 
         /* Create the service browser */
-        if (!(sb_ =
-                  avahi_service_browser_new(client_, AVAHI_IF_UNSPEC, AVAHI_PROTO_INET, serviceName.c_str(), nullptr, (AvahiLookupFlags)0, browse_callback, this)))
+        if (!(sb_ = avahi_service_browser_new(client_, AVAHI_IF_UNSPEC, AVAHI_PROTO_INET, serviceName.c_str(), nullptr, (AvahiLookupFlags)0, browse_callback,
+                                              this)))
             throw SnapException("BrowseAvahi - Failed to create service browser: " + std::string(avahi_strerror(avahi_client_errno(client_))));
 
         result_.valid = false;
diff --git a/client/decoder/decoder.h b/client/decoder/decoder.h
index 742e1ee9..e99006bb 100644
--- a/client/decoder/decoder.h
+++ b/client/decoder/decoder.h
@@ -28,7 +28,8 @@ class Decoder
 {
 public:
     Decoder(){};
-    virtual ~Decoder()= default;;
+    virtual ~Decoder() = default;
+
     virtual bool decode(msg::PcmChunk* chunk) = 0;
     virtual SampleFormat setHeader(msg::CodecHeader* chunk) = 0;
 
diff --git a/client/decoder/flacDecoder.cpp b/client/decoder/flacDecoder.cpp
index 3ee716e8..b90d3940 100644
--- a/client/decoder/flacDecoder.cpp
+++ b/client/decoder/flacDecoder.cpp
@@ -105,7 +105,8 @@ SampleFormat FlacDecoder::setHeader(msg::CodecHeader* chunk)
         throw SnapException("ERROR: allocating decoder");
 
     //	(void)FLAC__stream_decoder_set_md5_checking(decoder, true);
-    init_status = FLAC__stream_decoder_init_stream(decoder, read_callback, nullptr, nullptr, nullptr, nullptr, write_callback, metadata_callback, error_callback, this);
+    init_status =
+        FLAC__stream_decoder_init_stream(decoder, read_callback, nullptr, nullptr, nullptr, nullptr, write_callback, metadata_callback, error_callback, this);
     if (init_status != FLAC__STREAM_DECODER_INIT_STATUS_OK)
         throw SnapException("ERROR: initializing decoder: " + string(FLAC__StreamDecoderInitStatusString[init_status]));
 
diff --git a/common/message/hello.h b/common/message/hello.h
index 01bac5b7..dc3f3f38 100644
--- a/common/message/hello.h
+++ b/common/message/hello.h
@@ -48,8 +48,7 @@ public:
         msg["SnapStreamProtocolVersion"] = 2;
     }
 
-    ~Hello() override
-    = default;
+    ~Hello() override = default;
 
     std::string getMacAddress() const
     {
diff --git a/common/message/jsonMessage.h b/common/message/jsonMessage.h
index c730d7d4..c10bc051 100644
--- a/common/message/jsonMessage.h
+++ b/common/message/jsonMessage.h
@@ -36,8 +36,7 @@ public:
     {
     }
 
-    ~JsonMessage() override
-    = default;
+    ~JsonMessage() override = default;
 
     void read(std::istream& stream) override
     {
diff --git a/common/message/message.h b/common/message/message.h
index dffd9b25..1f32e835 100644
--- a/common/message/message.h
+++ b/common/message/message.h
@@ -126,8 +126,7 @@ struct BaseMessage
     {
     }
 
-    virtual ~BaseMessage()
-    = default;
+    virtual ~BaseMessage() = default;
 
     virtual void read(std::istream& stream)
     {
diff --git a/common/message/pcmChunk.h b/common/message/pcmChunk.h
index a4e6579f..8550f713 100644
--- a/common/message/pcmChunk.h
+++ b/common/message/pcmChunk.h
@@ -48,8 +48,7 @@ public:
     {
     }
 
-    ~PcmChunk() override
-    = default;
+    ~PcmChunk() override = default;
 
     int readFrames(void* outputBuffer, size_t frameCount)
     {
diff --git a/common/message/serverSettings.h b/common/message/serverSettings.h
index a926da5a..cc914d39 100644
--- a/common/message/serverSettings.h
+++ b/common/message/serverSettings.h
@@ -36,8 +36,7 @@ public:
         setMuted(false);
     }
 
-    ~ServerSettings() override
-    = default;
+    ~ServerSettings() override = default;
 
     int32_t getBufferMs()
     {
diff --git a/common/message/streamTags.h b/common/message/streamTags.h
index 62539d38..d2212169 100644
--- a/common/message/streamTags.h
+++ b/common/message/streamTags.h
@@ -65,8 +65,7 @@ public:
     {
     }
 
-    ~StreamTags() override
-    = default;
+    ~StreamTags() override = default;
 };
 }
 
diff --git a/common/message/time.h b/common/message/time.h
index 59d79483..d2acbe03 100644
--- a/common/message/time.h
+++ b/common/message/time.h
@@ -31,8 +31,7 @@ public:
     {
     }
 
-    ~Time() override
-    = default;
+    ~Time() override = default;
 
     void read(std::istream& stream) override
     {
diff --git a/common/sampleFormat.cpp b/common/sampleFormat.cpp
index 5351bd36..9b83b493 100644
--- a/common/sampleFormat.cpp
+++ b/common/sampleFormat.cpp
@@ -30,8 +30,7 @@
 using namespace std;
 
 
-SampleFormat::SampleFormat()
-= default;
+SampleFormat::SampleFormat() = default;
 
 
 SampleFormat::SampleFormat(const std::string& format)
diff --git a/common/snapException.h b/common/snapException.h
index 4439c46e..7a2e3585 100644
--- a/common/snapException.h
+++ b/common/snapException.h
@@ -72,8 +72,7 @@ public:
     }
 
 
-    ~AsyncSnapException() throw() override
-    = default;
+    ~AsyncSnapException() throw() override = default;
 };
 
 
diff --git a/server/config.cpp b/server/config.cpp
index 2b2bbbed..e499b3da 100644
--- a/server/config.cpp
+++ b/server/config.cpp
@@ -97,7 +97,7 @@ void Config::init(const std::string& root_directory, const std::string& user, co
             if (j.count("ConfigVersion"))
             {
                 json jGroups = j["Groups"];
-                for (auto & jGroup : jGroups)
+                for (auto& jGroup : jGroups)
                 {
                     GroupPtr group = make_shared<Group>();
                     group->fromJson(jGroup);
diff --git a/server/config.h b/server/config.h
index e5be9583..f27ea880 100644
--- a/server/config.h
+++ b/server/config.h
@@ -160,8 +160,7 @@ struct Snapcast
     {
     }
 
-    virtual ~Snapcast()
-    = default;
+    virtual ~Snapcast() = default;
 
     virtual void fromJson(const json& j)
     {
diff --git a/server/encoder/encoder.h b/server/encoder/encoder.h
index a70dad00..f44237b1 100644
--- a/server/encoder/encoder.h
+++ b/server/encoder/encoder.h
@@ -54,8 +54,7 @@ public:
     {
     }
 
-    virtual ~Encoder()
-    = default;
+    virtual ~Encoder() = default;
 
     /// The listener will receive the encoded stream
     virtual void init(EncoderListener* listener, const SampleFormat& format)
diff --git a/server/publishZeroConf/publishAvahi.cpp b/server/publishZeroConf/publishAvahi.cpp
index c7282de5..b8d1b8ce 100644
--- a/server/publishZeroConf/publishAvahi.cpp
+++ b/server/publishZeroConf/publishAvahi.cpp
@@ -149,8 +149,8 @@ void PublishAvahi::create_services(AvahiClient* c)
         /// We will now add two services and one subtype to the entry group
         for (const auto& service : services_)
         {
-            if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AvahiPublishFlags(0), name, service.name_.c_str(), nullptr, nullptr,
-                                                     service.port_, NULL)) < 0)
+            if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AvahiPublishFlags(0), name, service.name_.c_str(), nullptr,
+                                                     nullptr, service.port_, NULL)) < 0)
             {
                 if (ret == AVAHI_ERR_COLLISION)
                     goto collision;
diff --git a/server/publishZeroConf/publishmDNS.h b/server/publishZeroConf/publishmDNS.h
index 237deeda..53e8d043 100644
--- a/server/publishZeroConf/publishmDNS.h
+++ b/server/publishZeroConf/publishmDNS.h
@@ -23,8 +23,7 @@ public:
     {
     }
 
-    virtual ~PublishmDNS()
-    = default;
+    virtual ~PublishmDNS() = default;
 
     virtual void publish(const std::vector<mDNSService>& services) = 0;
 
diff --git a/server/streamServer.cpp b/server/streamServer.cpp
index f3da1d15..e38531ec 100644
--- a/server/streamServer.cpp
+++ b/server/streamServer.cpp
@@ -35,8 +35,7 @@ StreamServer::StreamServer(asio::io_service* io_service, const StreamServerSetti
 }
 
 
-StreamServer::~StreamServer()
-= default;
+StreamServer::~StreamServer() = default;
 
 
 void StreamServer::onMetaChanged(const PcmStream* pcmStream)
diff --git a/server/streamreader/spotifyStream.cpp b/server/streamreader/spotifyStream.cpp
index c2183e91..4326b320 100644
--- a/server/streamreader/spotifyStream.cpp
+++ b/server/streamreader/spotifyStream.cpp
@@ -63,8 +63,7 @@ SpotifyStream::SpotifyStream(PcmListener* pcmListener, const StreamUri& uri) : P
 }
 
 
-SpotifyStream::~SpotifyStream()
-= default;
+SpotifyStream::~SpotifyStream() = default;
 
 
 void SpotifyStream::initExeAndPath(const std::string& filename)