diff --git a/common/network/HealthCheckedConnectionTest.cpp b/common/network/HealthCheckedConnectionTest.cpp
index 3664d7825e..9f4a1618c7 100644
--- a/common/network/HealthCheckedConnectionTest.cpp
+++ b/common/network/HealthCheckedConnectionTest.cpp
@@ -260,7 +260,8 @@ void HealthCheckedConnectionTest::testChannelWithHeavyPacketLoss() {
  * Check the channel works when 2 of every 3 heartbeats are lost but the
  * timeout interval is 3 * heartbeat_interval rather than the default
  */
-void HealthCheckedConnectionTest::testChannelWithHeavyPacketLossLongerTimeout() {
+void HealthCheckedConnectionTest::
+    testChannelWithHeavyPacketLossLongerTimeout() {
   options.send_every = 3;
   MockHealthCheckedConnection connection(&socket,
                                          &m_ss,
@@ -284,7 +285,8 @@ void HealthCheckedConnectionTest::testChannelWithHeavyPacketLossLongerTimeout()
  * Check the channel fails when 3 of every 4 heartbeats are lost even though
  * the timeout interval is 3 * heartbeat_interval
  */
-void HealthCheckedConnectionTest::testChannelWithVeryHeavyPacketLossLongerTimeout() {
+void HealthCheckedConnectionTest::
+    testChannelWithVeryHeavyPacketLossLongerTimeout() {
   options.send_every = 4;
   options.abort_on_failure = false;
   MockHealthCheckedConnection connection(&socket,
diff --git a/include/ola/e133/E133Enums.h b/include/ola/e133/E133Enums.h
index 888ececf35..2bf81d75b0 100644
--- a/include/ola/e133/E133Enums.h
+++ b/include/ola/e133/E133Enums.h
@@ -97,7 +97,7 @@ enum {
   MAX_E133_STATUS_STRING_SIZE = 64
 };
 
-// The E1.33 version..
+// The E1.33 version.
 enum {
   E133_VERSION = 1
 };
diff --git a/libs/acn/BrokerClientEntryHeader.h b/libs/acn/BrokerClientEntryHeader.h
index d2277d9671..1a0bf86e92 100644
--- a/libs/acn/BrokerClientEntryHeader.h
+++ b/libs/acn/BrokerClientEntryHeader.h
@@ -36,27 +36,28 @@ namespace acn {
  */
 class BrokerClientEntryHeader {
  public:
-    BrokerClientEntryHeader() {}
+  BrokerClientEntryHeader() {}
 
-    BrokerClientEntryHeader(const ola::acn::CID &client_cid)
-        : m_client_cid(client_cid) {
-    }
-    ~BrokerClientEntryHeader() {}
+  explicit BrokerClientEntryHeader(const ola::acn::CID &client_cid)
+      : m_client_cid(client_cid) {
+  }
+  ~BrokerClientEntryHeader() {}
 
-    const ola::acn::CID ClientCid() const { return m_client_cid; }
+  const ola::acn::CID ClientCid() const { return m_client_cid; }
 
-    bool operator==(const BrokerClientEntryHeader &other) const {
-      return m_client_cid == other.m_client_cid;
-    }
+  bool operator==(const BrokerClientEntryHeader &other) const {
+    return m_client_cid == other.m_client_cid;
+  }
 
-    PACK(
-    struct broker_client_entry_pdu_header_s {
-      uint8_t client_cid[CID::CID_LENGTH];
-    });
-    typedef struct broker_client_entry_pdu_header_s broker_client_entry_pdu_header;
+  PACK(
+  struct broker_client_entry_pdu_header_s {
+    uint8_t client_cid[CID::CID_LENGTH];
+  });
+  typedef struct broker_client_entry_pdu_header_s
+      broker_client_entry_pdu_header;
 
  private:
-    ola::acn::CID m_client_cid;
+  ola::acn::CID m_client_cid;
 };
 }  // namespace acn
 }  // namespace ola
diff --git a/libs/acn/BrokerClientEntryPDU.cpp b/libs/acn/BrokerClientEntryPDU.cpp
index 521604e742..dc850e3316 100644
--- a/libs/acn/BrokerClientEntryPDU.cpp
+++ b/libs/acn/BrokerClientEntryPDU.cpp
@@ -49,12 +49,13 @@ unsigned int BrokerClientEntryPDU::DataSize() const {
 /*
  * Pack the header portion.
  */
-bool BrokerClientEntryPDU::PackHeader(uint8_t *data, unsigned int *length) const {
+bool BrokerClientEntryPDU::PackHeader(uint8_t *data,
+                                      unsigned int *length) const {
   unsigned int header_size = HeaderSize();
 
   if (*length < header_size) {
-    OLA_WARN << "BrokerClientEntryPDU::PackHeader: buffer too small, got " << *length
-             << " required " << header_size;
+    OLA_WARN << "BrokerClientEntryPDU::PackHeader: buffer too small, got "
+             << *length << " required " << header_size;
     *length = 0;
     return false;
   }
@@ -70,7 +71,8 @@ bool BrokerClientEntryPDU::PackHeader(uint8_t *data, unsigned int *length) const
 /*
  * Pack the data portion.
  */
-bool BrokerClientEntryPDU::PackData(uint8_t *data, unsigned int *length) const {
+bool BrokerClientEntryPDU::PackData(uint8_t *data,
+                                    unsigned int *length) const {
   if (m_pdu)
     return m_pdu->Pack(data, length);
   *length = 0;
@@ -84,8 +86,9 @@ bool BrokerClientEntryPDU::PackData(uint8_t *data, unsigned int *length) const {
 void BrokerClientEntryPDU::PackHeader(OutputStream *stream) const {
   BrokerClientEntryHeader::broker_client_entry_pdu_header header;
   m_header.ClientCid().Pack(header.client_cid);
-  stream->Write(reinterpret_cast<uint8_t*>(&header),
-                sizeof(BrokerClientEntryHeader::broker_client_entry_pdu_header));
+  stream->Write(
+      reinterpret_cast<uint8_t*>(&header),
+      sizeof(BrokerClientEntryHeader::broker_client_entry_pdu_header));
 }
 
 
@@ -103,8 +106,9 @@ void BrokerClientEntryPDU::PrependPDU(ola::io::IOStack *stack,
                                       const ola::acn::CID &client_cid) {
   BrokerClientEntryHeader::broker_client_entry_pdu_header header;
   client_cid.Pack(header.client_cid);
-  stack->Write(reinterpret_cast<uint8_t*>(&header),
-               sizeof(BrokerClientEntryHeader::broker_client_entry_pdu_header));
+  stack->Write(
+      reinterpret_cast<uint8_t*>(&header),
+      sizeof(BrokerClientEntryHeader::broker_client_entry_pdu_header));
 
   vector = HostToNetwork(vector);
   stack->Write(reinterpret_cast<uint8_t*>(&vector), sizeof(vector));
diff --git a/libs/acn/BrokerClientEntryPDUTest.cpp b/libs/acn/BrokerClientEntryPDUTest.cpp
index e907d03a33..3c8a1d41ab 100644
--- a/libs/acn/BrokerClientEntryPDUTest.cpp
+++ b/libs/acn/BrokerClientEntryPDUTest.cpp
@@ -59,7 +59,8 @@ class BrokerClientEntryPDUTest: public CppUnit::TestFixture {
   static const uint8_t TEST_DATA[];
 };
 
-const uint8_t BrokerClientEntryPDUTest::TEST_DATA[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+const uint8_t BrokerClientEntryPDUTest::TEST_DATA[] = {0, 1, 2, 3, 4, 5,
+                                                       6, 7, 8, 9, 10, 11,
                                                        12, 13, 14, 15};
 
 CPPUNIT_TEST_SUITE_REGISTRATION(BrokerClientEntryPDUTest);
diff --git a/libs/acn/BrokerConnectPDU.cpp b/libs/acn/BrokerConnectPDU.cpp
index 8bf3114ace..a93811c1cd 100644
--- a/libs/acn/BrokerConnectPDU.cpp
+++ b/libs/acn/BrokerConnectPDU.cpp
@@ -18,12 +18,13 @@
  * Copyright (C) 2023 Peter Newman
  */
 
-#include <algorithm>
-
 #include "libs/acn/BrokerConnectPDU.h"
 
-#include <ola/network/NetworkUtils.h>
-#include <ola/acn/ACNVectors.h>
+#include <algorithm>
+#include <string>
+
+#include "ola/acn/ACNVectors.h"
+#include "ola/network/NetworkUtils.h"
 
 namespace ola {
 namespace acn {
@@ -34,22 +35,24 @@ using std::min;
 using std::string;
 
 unsigned int BrokerConnectPDU::DataSize() const {
-  //broker_connect_pdu_data data;
   return static_cast<unsigned int>(sizeof(broker_connect_pdu_data));
 }
 
 bool BrokerConnectPDU::PackData(uint8_t *data, unsigned int *length) const {
   broker_connect_pdu_data pdu_data;
 
-  size_t client_scope_str_len = min(m_client_scope.size(), sizeof(pdu_data.client_scope));
+  size_t client_scope_str_len = min(m_client_scope.size(),
+                                    sizeof(pdu_data.client_scope));
   strncpy(pdu_data.client_scope, m_client_scope.c_str(), client_scope_str_len);
   memset(pdu_data.client_scope + client_scope_str_len, 0,
          (sizeof(pdu_data.client_scope) - client_scope_str_len));
 
   pdu_data.e133_version = HostToNetwork(m_e133_version);
 
-  size_t search_domain_str_len = min(m_search_domain.size(), sizeof(pdu_data.search_domain));
-  strncpy(pdu_data.search_domain, m_search_domain.c_str(), search_domain_str_len);
+  size_t search_domain_str_len = min(m_search_domain.size(),
+                                     sizeof(pdu_data.search_domain));
+  strncpy(pdu_data.search_domain, m_search_domain.c_str(),
+          search_domain_str_len);
   memset(pdu_data.search_domain + search_domain_str_len, 0,
          (sizeof(pdu_data.search_domain) - search_domain_str_len));
 
@@ -67,15 +70,18 @@ bool BrokerConnectPDU::PackData(uint8_t *data, unsigned int *length) const {
 void BrokerConnectPDU::PackData(ola::io::OutputStream *stream) const {
   broker_connect_pdu_data pdu_data;
 
-  size_t client_scope_str_len = min(m_client_scope.size(), sizeof(pdu_data.client_scope));
+  size_t client_scope_str_len = min(m_client_scope.size(),
+                                    sizeof(pdu_data.client_scope));
   strncpy(pdu_data.client_scope, m_client_scope.c_str(), client_scope_str_len);
   memset(pdu_data.client_scope + client_scope_str_len, 0,
          (sizeof(pdu_data.client_scope) - client_scope_str_len));
 
   pdu_data.e133_version = HostToNetwork(m_e133_version);
 
-  size_t search_domain_str_len = min(m_search_domain.size(), sizeof(pdu_data.search_domain));
-  strncpy(pdu_data.search_domain, m_search_domain.c_str(), search_domain_str_len);
+  size_t search_domain_str_len = min(m_search_domain.size(),
+                                     sizeof(pdu_data.search_domain));
+  strncpy(pdu_data.search_domain, m_search_domain.c_str(),
+          search_domain_str_len);
   memset(pdu_data.search_domain + search_domain_str_len, 0,
          (sizeof(pdu_data.search_domain) - search_domain_str_len));
 
@@ -96,15 +102,18 @@ void BrokerConnectPDU::PrependPDU(ola::io::IOStack *stack,
                                   bool incremental_updates) {
   broker_connect_pdu_data pdu_data;
 
-  size_t client_scope_str_len = min(client_scope.size(), sizeof(pdu_data.client_scope));
+  size_t client_scope_str_len = min(client_scope.size(),
+                                    sizeof(pdu_data.client_scope));
   strncpy(pdu_data.client_scope, client_scope.c_str(), client_scope_str_len);
   memset(pdu_data.client_scope + client_scope_str_len, 0,
          (sizeof(pdu_data.client_scope) - client_scope_str_len));
 
   pdu_data.e133_version = HostToNetwork(e133_version);
 
-  size_t search_domain_str_len = min(search_domain.size(), sizeof(pdu_data.search_domain));
-  strncpy(pdu_data.search_domain, search_domain.c_str(), search_domain_str_len);
+  size_t search_domain_str_len = min(search_domain.size(),
+                                     sizeof(pdu_data.search_domain));
+  strncpy(pdu_data.search_domain, search_domain.c_str(),
+          search_domain_str_len);
   memset(pdu_data.search_domain + search_domain_str_len, 0,
          (sizeof(pdu_data.search_domain) - search_domain_str_len));
 
@@ -115,7 +124,8 @@ void BrokerConnectPDU::PrependPDU(ola::io::IOStack *stack,
   pdu_data.connection = HostToNetwork(connection);
   stack->Write(reinterpret_cast<uint8_t*>(&pdu_data),
                static_cast<unsigned int>(sizeof(broker_connect_pdu_data)));
-  uint16_t vector = HostToNetwork(static_cast<uint16_t>(VECTOR_BROKER_CONNECT));
+  uint16_t vector = HostToNetwork(
+      static_cast<uint16_t>(VECTOR_BROKER_CONNECT));
   stack->Write(reinterpret_cast<uint8_t*>(&vector), sizeof(vector));
   PrependFlagsAndLength(stack, VFLAG_MASK | HFLAG_MASK | DFLAG_MASK, true);
 }
diff --git a/libs/acn/BrokerConnectPDU.h b/libs/acn/BrokerConnectPDU.h
index 8850ed00c8..9712ce4e02 100644
--- a/libs/acn/BrokerConnectPDU.h
+++ b/libs/acn/BrokerConnectPDU.h
@@ -21,10 +21,11 @@
 #ifndef LIBS_ACN_BROKERCONNECTPDU_H_
 #define LIBS_ACN_BROKERCONNECTPDU_H_
 
-#include <ola/io/IOStack.h>
-#include <ola/rdm/RDMEnums.h>
+#include <string>
 
 #include "libs/acn/PDU.h"
+#include "ola/io/IOStack.h"
+#include "ola/rdm/RDMEnums.h"
 
 namespace ola {
 namespace acn {
diff --git a/libs/acn/BrokerNullPDU.h b/libs/acn/BrokerNullPDU.h
index 88450f7ad0..0bd2a768a4 100644
--- a/libs/acn/BrokerNullPDU.h
+++ b/libs/acn/BrokerNullPDU.h
@@ -47,7 +47,7 @@ class BrokerNullPDU : public PDU {
     *length = 0;
     return true;
   }
-  void PackData(OLA_UNUSED ola::io::OutputStream *stream) const {};
+  void PackData(OLA_UNUSED ola::io::OutputStream *stream) const {}
 
   static void PrependPDU(ola::io::IOStack *stack);
 };
diff --git a/libs/acn/BrokerPDU.cpp b/libs/acn/BrokerPDU.cpp
index 50364833ce..b01f5d834c 100644
--- a/libs/acn/BrokerPDU.cpp
+++ b/libs/acn/BrokerPDU.cpp
@@ -42,8 +42,9 @@ unsigned int BrokerPDU::DataSize() const {
  * Pack the data portion.
  */
 bool BrokerPDU::PackData(uint8_t *data, unsigned int *length) const {
-  if (m_pdu)
+  if (m_pdu) {
     return m_pdu->Pack(data, length);
+  }
   *length = 0;
   return true;
 }
@@ -53,8 +54,9 @@ bool BrokerPDU::PackData(uint8_t *data, unsigned int *length) const {
  * Pack the data into a buffer
  */
 void BrokerPDU::PackData(OutputStream *stream) const {
-  if (m_pdu)
+  if (m_pdu) {
     m_pdu->Write(stream);
+  }
 }
 
 
diff --git a/libs/acn/LLRPProbeReplyInflator.h b/libs/acn/LLRPProbeReplyInflator.h
index 3aab45f7b1..51f77d6cae 100644
--- a/libs/acn/LLRPProbeReplyInflator.h
+++ b/libs/acn/LLRPProbeReplyInflator.h
@@ -36,7 +36,7 @@ class LLRPProbeReplyInflator: public BaseInflator {
 
  public:
   struct LLRPProbeReply {
-    LLRPProbeReply(const ola::rdm::UID &_uid)
+    explicit LLRPProbeReply(const ola::rdm::UID &_uid)
        : uid(_uid) {
     }
     ola::rdm::UID uid;
diff --git a/libs/acn/LLRPProbeRequestInflator.cpp b/libs/acn/LLRPProbeRequestInflator.cpp
index adf7d63fdd..d160fa10fe 100644
--- a/libs/acn/LLRPProbeRequestInflator.cpp
+++ b/libs/acn/LLRPProbeRequestInflator.cpp
@@ -93,17 +93,22 @@ bool LLRPProbeRequestInflator::HandlePDUData(uint32_t vector,
       pdu_len - (sizeof(pdu_data) -
       sizeof(pdu_data.known_uids)));
   if (known_uids_size % UID::UID_SIZE != 0) {
-    OLA_WARN << "Got a partial known UID, received " << known_uids_size << " bytes";
+    OLA_WARN << "Got a partial known UID, received " << known_uids_size
+             << " bytes";
     return false;
   }
 
   memcpy(reinterpret_cast<uint8_t*>(&pdu_data), data, sizeof(pdu_data));
 
-  OLA_DEBUG << "Probe from " << UID(pdu_data.lower_uid) << " to " << UID(pdu_data.upper_uid);
+  OLA_DEBUG << "Probe from " << UID(pdu_data.lower_uid) << " to "
+            << UID(pdu_data.upper_uid);
 
   LLRPProbeRequest request(UID(pdu_data.lower_uid), UID(pdu_data.upper_uid));
-  request.client_tcp_connection_inactive = (pdu_data.filter & LLRPProbeRequestPDU::FILTER_CLIENT_TCP_CONNECTION_INACTIVE);
-  request.brokers_only = (pdu_data.filter & LLRPProbeRequestPDU::FILTER_BROKERS_ONLY);
+  request.client_tcp_connection_inactive =
+      (pdu_data.filter &
+       LLRPProbeRequestPDU::FILTER_CLIENT_TCP_CONNECTION_INACTIVE);
+  request.brokers_only = (pdu_data.filter &
+                          LLRPProbeRequestPDU::FILTER_BROKERS_ONLY);
   unsigned int known_uids_used_size = known_uids_size;
   request.known_uids = UIDSet(pdu_data.known_uids, &known_uids_used_size);
 
diff --git a/libs/acn/LLRPProbeRequestPDU.cpp b/libs/acn/LLRPProbeRequestPDU.cpp
index ee8a021ec7..4302fa0ee8 100644
--- a/libs/acn/LLRPProbeRequestPDU.cpp
+++ b/libs/acn/LLRPProbeRequestPDU.cpp
@@ -81,6 +81,55 @@ void LLRPProbeRequestPDU::PackData(ola::io::OutputStream *stream) const {
                                           (m_known_uids.Size() * UID::LENGTH)));
 }
 
+unsigned int LLRPProbeRequestPDU::DataSize() const {
+  llrp_probe_request_pdu_data data;
+  return static_cast<unsigned int>(sizeof(llrp_probe_request_pdu_data) -
+                                   sizeof(data.known_uids) +
+                                   (m_known_uids.Size() * UID::LENGTH));
+}
+
+bool LLRPProbeRequestPDU::PackData(uint8_t *data, unsigned int *length) const {
+  llrp_probe_request_pdu_data pdu_data;
+  m_lower_uid.Pack(pdu_data.lower_uid, sizeof(pdu_data.lower_uid));
+  m_upper_uid.Pack(pdu_data.upper_uid, sizeof(pdu_data.upper_uid));
+  uint16_t filter = 0;
+  if (m_client_tcp_connection_inactive) {
+    filter |= FILTER_CLIENT_TCP_CONNECTION_INACTIVE;
+  }
+  if (m_brokers_only) {
+    filter |= FILTER_BROKERS_ONLY;
+  }
+  pdu_data.filter = HostToNetwork(filter);
+  // TODO(Peter): We need to check we've got <= 200 UIDs here
+  m_known_uids.Pack(pdu_data.known_uids, sizeof(pdu_data.known_uids));
+  *length = static_cast<unsigned int>(sizeof(llrp_probe_request_pdu_data) -
+                                      sizeof(pdu_data.known_uids) +
+                                      (m_known_uids.Size() * UID::LENGTH));
+
+  memcpy(data, &pdu_data, *length);
+  return true;
+}
+
+void LLRPProbeRequestPDU::PackData(ola::io::OutputStream *stream) const {
+  llrp_probe_request_pdu_data data;
+  m_lower_uid.Pack(data.lower_uid, sizeof(data.lower_uid));
+  m_upper_uid.Pack(data.upper_uid, sizeof(data.upper_uid));
+  uint16_t filter = 0;
+  if (m_client_tcp_connection_inactive) {
+    filter |= FILTER_CLIENT_TCP_CONNECTION_INACTIVE;
+  }
+  if (m_brokers_only) {
+    filter |= FILTER_BROKERS_ONLY;
+  }
+  data.filter = HostToNetwork(filter);
+  // TODO(Peter): We need to check we've got <= 200 UIDs here
+  m_known_uids.Pack(data.known_uids, sizeof(data.known_uids));
+  stream->Write(reinterpret_cast<uint8_t*>(&data),
+                static_cast<unsigned int>(sizeof(llrp_probe_request_pdu_data) -
+                                          sizeof(data.known_uids) +
+                                          (m_known_uids.Size() * UID::LENGTH)));
+}
+
 void LLRPProbeRequestPDU::PrependPDU(ola::io::IOStack *stack,
                                      const UID &lower_uid,
                                      const UID &upper_uid,
diff --git a/libs/acn/Makefile.mk b/libs/acn/Makefile.mk
index 31184b5ced..87077deec6 100644
--- a/libs/acn/Makefile.mk
+++ b/libs/acn/Makefile.mk
@@ -38,6 +38,20 @@ noinst_LTLIBRARIES += libs/acn/libolae131core.la
 libs_acn_libolae131core_la_SOURCES = \
     libs/acn/BaseInflator.cpp \
     libs/acn/BaseInflator.h \
+    libs/acn/BrokerClientAddInflator.h \
+    libs/acn/BrokerClientEntryChangeInflator.h \
+    libs/acn/BrokerClientEntryHeader.h \
+    libs/acn/BrokerClientEntryPDU.cpp \
+    libs/acn/BrokerClientEntryPDU.h \
+    libs/acn/BrokerClientRemoveInflator.h \
+    libs/acn/BrokerConnectPDU.cpp \
+    libs/acn/BrokerConnectPDU.h \
+    libs/acn/BrokerInflator.h \
+    libs/acn/BrokerNullInflator.h \
+    libs/acn/BrokerNullPDU.cpp \
+    libs/acn/BrokerNullPDU.h \
+    libs/acn/BrokerPDU.cpp \
+    libs/acn/BrokerPDU.h \
     libs/acn/DMPAddress.cpp \
     libs/acn/DMPAddress.h \
     libs/acn/DMPE131Inflator.cpp \
diff --git a/libs/acn/RDMInflator.h b/libs/acn/RDMInflator.h
index 27b43fb7bb..ed33b64983 100644
--- a/libs/acn/RDMInflator.h
+++ b/libs/acn/RDMInflator.h
@@ -34,45 +34,47 @@ class RDMInflator: public BaseInflator {
   friend class RDMInflatorTest;
 
  public:
-    // These are pointers so the callers don't have to pull in all the headers.
-    typedef ola::Callback3<void,
-                           const TransportHeader*,  // src ip & port
-                           const E133Header*,  // the E1.33 header
-                           const std::string&  // rdm data
-                          > RDMMessageHandler;
+  // These are pointers so the callers don't have to pull in all the headers.
+  typedef ola::Callback3<void,
+                         const TransportHeader*,  // src ip & port
+                         const E133Header*,  // the E1.33 header
+                         const std::string&  // rdm data
+                        > RDMMessageHandler;
 
-    typedef ola::Callback2<void,
-                           const HeaderSet*,  // the HeaderSet
-                           const std::string&  // rdm data
-                          > GenericRDMMessageHandler;
+  typedef ola::Callback2<void,
+                         const HeaderSet*,  // the HeaderSet
+                         const std::string&  // rdm data
+                        > GenericRDMMessageHandler;
 
-    // TODO(Peter): Set a better default vector for RDM use (possibly the RPT
-    // one)
-    RDMInflator(unsigned int vector = ola::acn::VECTOR_FRAMING_RDMNET);
-    ~RDMInflator() {}
+  // TODO(Peter): Set a better default vector for RDM use (possibly the RPT
+  // one)
+  explicit RDMInflator(unsigned int vector = ola::acn::VECTOR_FRAMING_RDMNET);
+  ~RDMInflator() {}
 
-    uint32_t Id() const { return m_vector; }
+  uint32_t Id() const { return m_vector; }
 
-    void SetRDMHandler(RDMMessageHandler *handler);
-    void SetGenericRDMHandler(GenericRDMMessageHandler *handler);
+  void SetRDMHandler(RDMMessageHandler *handler);
+  void SetGenericRDMHandler(GenericRDMMessageHandler *handler);
+
+  static const unsigned int VECTOR_RDMNET_DATA = 0xcc;
 
  protected:
-    bool DecodeHeader(HeaderSet *headers,
-                      const uint8_t *data,
-                      unsigned int len,
-                      unsigned int *bytes_used);
+  bool DecodeHeader(HeaderSet *headers,
+                    const uint8_t *data,
+                    unsigned int len,
+                    unsigned int *bytes_used);
 
-    void ResetHeaderField() {}  // namespace noop
+  void ResetHeaderField() {}  // namespace noop
 
-    virtual bool HandlePDUData(uint32_t vector,
-                               const HeaderSet &headers,
-                               const uint8_t *data,
-                               unsigned int pdu_len);
+  virtual bool HandlePDUData(uint32_t vector,
+                             const HeaderSet &headers,
+                             const uint8_t *data,
+                             unsigned int pdu_len);
 
  private:
-    std::auto_ptr<RDMMessageHandler> m_rdm_handler;
-    std::auto_ptr<GenericRDMMessageHandler> m_generic_rdm_handler;
-    unsigned int m_vector;
+  std::auto_ptr<RDMMessageHandler> m_rdm_handler;
+  std::auto_ptr<GenericRDMMessageHandler> m_generic_rdm_handler;
+  unsigned int m_vector;
 };
 }  // namespace acn
 }  // namespace ola
diff --git a/libs/acn/RDMPDU.cpp b/libs/acn/RDMPDU.cpp
index 5c47cbb1e0..a816592680 100644
--- a/libs/acn/RDMPDU.cpp
+++ b/libs/acn/RDMPDU.cpp
@@ -20,8 +20,8 @@
 
 #include "libs/acn/RDMPDU.h"
 
-#include <ola/network/NetworkUtils.h>
-#include <ola/rdm/RDMPacket.h>
+#include "ola/network/NetworkUtils.h"
+#include "ola/rdm/RDMPacket.h"
 
 namespace ola {
 namespace acn {
diff --git a/libs/acn/RDMPDU.h b/libs/acn/RDMPDU.h
index c51d9a140f..b81afb623a 100644
--- a/libs/acn/RDMPDU.h
+++ b/libs/acn/RDMPDU.h
@@ -22,11 +22,11 @@
 #define LIBS_ACN_RDMPDU_H_
 
 #include <string>
-#include <ola/io/ByteString.h>
-#include <ola/io/IOStack.h>
-#include <ola/rdm/RDMPacket.h>
 
 #include "libs/acn/PDU.h"
+#include "ola/io/ByteString.h"
+#include "ola/io/IOStack.h"
+#include "ola/rdm/RDMPacket.h"
 
 namespace ola {
 namespace acn {
diff --git a/plugins/e131/E131Plugin.h b/plugins/e131/E131Plugin.h
index fed52781b3..1bcfced735 100644
--- a/plugins/e131/E131Plugin.h
+++ b/plugins/e131/E131Plugin.h
@@ -14,7 +14,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * E131Plugin.h
- * Interface for the E1.131 plugin class
+ * Interface for the E1.31 plugin class
  * Copyright (C) 2007 Simon Newton
  */
 
diff --git a/plugins/kinet/README.md b/plugins/kinet/README.md
index 68bca96c5f..e2872ec783 100644
--- a/plugins/kinet/README.md
+++ b/plugins/kinet/README.md
@@ -8,13 +8,13 @@ the Port Out (V2) modes of the KiNET protocol.
 
 ## Config file: `ola-kinet.conf`
 
-`power_supply = <ip>`
+`power_supply = <ip>`  
 The IP of the power supply to send to. You can communicate with more than
 one power supply by adding multiple `power_supply =` lines.
 
 ### Per Power Supply Settings
 
-`<ip>-mode = [dmxout|portout]`
+`<ip>-mode = [dmxout|portout]`  
 The mode of KiNET to send to the power supply. DMX Out is sometimes known as
 V1 and Port Out as V2.
 
@@ -32,7 +32,7 @@ for the wildcard universe on each device. Instead, the universe for each
 device may be patched by assigning this output port to the intended universe
 in OLA.
 
-`<ip>-ports = <int>`
+`<ip>-ports = <int>`  
 The number of physical ports available on the power supply in Port Out mode.
 Each physical port will create an OLA port that may be assigned to any
 universe. This setting is ignored in DMX Out mode. The default and maximum
diff --git a/plugins/uartdmx/README.md b/plugins/uartdmx/README.md
index 409b532d3f..79e1a7139a 100644
--- a/plugins/uartdmx/README.md
+++ b/plugins/uartdmx/README.md
@@ -12,10 +12,10 @@ http://eastertrail.blogspot.co.uk/2014/04/command-and-control-ii.html
 
 ## Config file: `ola-uartdmx.conf`
 
-`enabled = true`
+`enabled = true`  
 Enable this plugin (DISABLED by default).
 
-`device = /dev/ttyAMA0`
+`device = /dev/ttyAMA0`  
 The device to use for DMX output (optional). Multiple devices are supported
 if the hardware exists. On later software it may also be /dev/serial0.
 Using USB-serial adapters is not supported (try the
@@ -24,8 +24,8 @@ Using USB-serial adapters is not supported (try the
 
 ### Per Device Settings (using above device name)
 
-`<device>-break = 100`
+`<device>-break = 100`  
 The DMX break time in microseconds for this device (optional).
 
-`<device>-malf = 100`
+`<device>-malf = 100`  
 The Mark After Last Frame time in microseconds for this device (optional).