diff --git a/examples/demo/demo.ino b/examples/demo/demo.ino
index 15fde03..499d4f3 100644
--- a/examples/demo/demo.ino
+++ b/examples/demo/demo.ino
@@ -10,7 +10,7 @@ void setup() {
 }
 
 void loop() {
-  static uint16_t count = 0;
+  static uint16_t count {0};
 
   if (serialA.available()) {
     serialA.print("received: ");
diff --git a/src/buffer.tcc b/src/buffer.tcc
index aa31264..e28a458 100644
--- a/src/buffer.tcc
+++ b/src/buffer.tcc
@@ -57,10 +57,10 @@ public:
   int16_t peek() const;
 
 private:
-  uint8_t buffer_[1ul << bits]{};
+  uint8_t buffer_[1ul << bits] {};
   uint8_t start_: bits;
   uint8_t end_: bits;
-  uint8_t mask_ = (1ul << bits) - 1;
+  uint8_t mask_ {(1ul << bits) - 1};
 };
 
 
@@ -78,8 +78,8 @@ uint8_t Buffer<bits>::available() const {
 
 template <uint8_t bits>
 uint8_t Buffer<bits>::read(uint8_t* const data, uint8_t const size) {
-  uint8_t size_ = min(size, available());
-  for (uint8_t i = 0; i < size_; i++) {
+  uint8_t size_ {min(size, available())};
+  for (uint8_t i {0}; i < size_; i++) {
     data[i] = buffer_[start_++];
   }
   return size_;
@@ -95,7 +95,7 @@ int16_t Buffer<bits>::read() {
 
 template <uint8_t bits>
 void Buffer<bits>::write(uint8_t* const data, uint8_t size) {
-  for (uint8_t i = 0; i < size; i++) {
+  for (uint8_t i {0}; i < size; i++) {
     buffer_[end_++] = data[i];
   }
 }
diff --git a/src/serialMux.tcc b/src/serialMux.tcc
index d53826a..ab67e41 100644
--- a/src/serialMux.tcc
+++ b/src/serialMux.tcc
@@ -2,18 +2,18 @@
 
 #include "buffer.tcc"
 
-uint8_t const protocol_[] =  {'s', 'e', 'r', 'i', 'a', 'l', 'M', 'u', 'x'};
-uint8_t const version_[] =  {2, 0, 0};
-uint8_t const escape_ = 0xff;
-uint8_t const controlPort_ = 0xfe;
+uint8_t const protocol_[] {'s', 'e', 'r', 'i', 'a', 'l', 'M', 'u', 'x'};
+uint8_t const version_[] {2, 0, 0};
+uint8_t const escape_ {0xff};
+uint8_t const controlPort_ {0xfe};
 
 // Control commands.
-uint8_t const cmdProtocol_ = 0x00;
-uint8_t const cmdVersion_ = 0x01;
-uint8_t const cmdGet_ports_ = 0x02;
-uint8_t const cmdEnable_ = 0x03;
-uint8_t const cmdDisable_ = 0x04;
-uint8_t const cmdReset_ = 0x05;
+uint8_t const cmdProtocol_ {0x00};
+uint8_t const cmdVersion_ {0x01};
+uint8_t const cmdGet_ports_ {0x02};
+uint8_t const cmdEnable_ {0x03};
+uint8_t const cmdDisable_ {0x04};
+uint8_t const cmdReset_ {0x05};
 
 /*! Serial multiplexer.
  *
@@ -79,12 +79,12 @@ private:
   uint8_t read_() const;
   void write_(uint8_t const, uint8_t const* const, uint8_t const);
 
-  Buffer<bits>* buffer_ = nullptr;
-  bool enabled_ = false;
-  uint8_t portRx_ = controlPort_;
-  uint8_t portTx_ = controlPort_;
-  uint8_t ports_ = 0;
-  Stream* serial_ = nullptr;
+  Buffer<bits>* buffer_ {nullptr};
+  bool enabled_ {false};
+  uint8_t portRx_ {controlPort_};
+  uint8_t portTx_ {controlPort_};
+  uint8_t ports_ {0};
+  Stream* serial_ {nullptr};
 };
 
 using SerialMux = SerialMux_<>;  //!< Serial multiplexer.
@@ -103,7 +103,7 @@ SerialMux_<bits>::~SerialMux_() {
 
 template <uint8_t bits>
 uint8_t SerialMux_<bits>::add() {
-  Buffer<bits>* newBuffer = new Buffer<bits>[++ports_];
+  Buffer<bits>* newBuffer {new Buffer<bits>[++ports_]};
   memcpy(newBuffer, buffer_, (ports_ - 1) * sizeof(Buffer<bits>));
   delete[] buffer_;
   buffer_ = newBuffer;
@@ -160,7 +160,7 @@ void SerialMux_<bits>::control_(uint8_t const data) {
     case cmdReset_:
       break;
   }
-  uint8_t const data_ = 0;
+  uint8_t const data_ {0};
   write_(controlPort_, &data_, 1);
 }
 
@@ -170,9 +170,9 @@ void SerialMux_<bits>::control_(uint8_t const data) {
 template <uint8_t bits>
 void SerialMux_<bits>::update_() {
   while (serial_->available()) {
-    uint8_t data = read_();
+    uint8_t data {read_()};
     if (data == escape_) {
-      uint8_t port = read_();
+      uint8_t port {read_()};
       if (port != escape_) {
         portRx_ = port;
         continue;
@@ -215,7 +215,7 @@ void SerialMux_<bits>::write_(
       serial_->write(escape_);
       serial_->write(portTx_);
     }
-    for (uint8_t i = 0; i < size; i++) {
+    for (uint8_t i {0}; i < size; i++) {
       if (data[i] == escape_) {
         serial_->write(escape_);
       }
diff --git a/src/vSerial.tcc b/src/vSerial.tcc
index 352a333..5911e6d 100644
--- a/src/vSerial.tcc
+++ b/src/vSerial.tcc
@@ -44,8 +44,8 @@ public:
   int peek();
 
 private:
-  SerialMux_<bits>* _mux = nullptr;
-  uint8_t _port = 0;
+  SerialMux_<bits>* _mux {nullptr};
+  uint8_t _port {0};
 };
 
 using VSerial = VSerial_<>;  //!< Virtual serial device.
diff --git a/tests/test_buffer.cc b/tests/test_buffer.cc
index 4cc8d5b..2cf5549 100644
--- a/tests/test_buffer.cc
+++ b/tests/test_buffer.cc
@@ -48,25 +48,25 @@ TEST_CASE("Read byte, zero bytes remaining", "[buffer][simgle]") {
 }
 
 TEST_CASE("Read multiple bytes, nothing available", "[buffer][multiple]") {
-  uint8_t* data{};
+  uint8_t* data {};
   REQUIRE(buffer.read(data, 3) == 0);
 }
 
 TEST_CASE("Write multiple bytes", "[buffer][multiple]") {
-  uint8_t data[] = "abc";
+  uint8_t data[] {"abc"};
   buffer.write(data, 3);
   REQUIRE(buffer.available() == 3);
 }
 
 TEST_CASE("Read multiple bytes", "[buffer][multiple]") {
-  uint8_t data[3]{};
+  uint8_t data[3] {};
   REQUIRE(buffer.read(data, 3) == 3);
   REQUIRE(!memcmp(data, "abc", 3));
   REQUIRE(buffer.available() == 0);
 }
 
 TEST_CASE("Read too many bytes", "[buffer][multiple]") {
-  uint8_t data[4]{};
+  uint8_t data[4] {};
   buffer.write(data, 3);
   REQUIRE(buffer.read(data, 4) == 3);
   REQUIRE(buffer.available() == 0);
diff --git a/tests/test_serialMux.cc b/tests/test_serialMux.cc
index 65a6e64..fc9379f 100644
--- a/tests/test_serialMux.cc
+++ b/tests/test_serialMux.cc
@@ -9,7 +9,7 @@ SerialMux_<6> mux(Serial);
 void _checkTx(
     SerialMux_<6>& mux, char const* const data, uint8_t const size) {
   mux.available(0);
-  for (uint8_t i = 0; i < size; i++) {
+  for (uint8_t i {0}; i < size; i++) {
     REQUIRE(Serial.inspect<char>() == data[i]);
   }
   Serial.reset();
@@ -107,12 +107,12 @@ TEST_CASE("Read byte from ports, zero bytes remaining", "[mux][single]") {
 
 TEST_CASE("Write multiple bytes to ports", "[mux][multiple]") {
   {
-    uint8_t const data[] = {0x01, 0x02, 0x03};
+    uint8_t const data[] {0x01, 0x02, 0x03};
     mux.write_(0, data, 3);
     _checkTx(mux, "\xff\x00\x01\x02\x03", 5);
   }
   {
-    uint8_t const data[] = {0x04, 0x05, 0x06};
+    uint8_t const data[] {0x04, 0x05, 0x06};
     mux.write_(1, data, 3);
     _checkTx(mux, "\xff\x01\x04\x05\x06", 5);
   }