diff --git a/src/ponko_avatar.cpp b/src/ponko_avatar.cpp
index 73be2ba..127b7c8 100644
--- a/src/ponko_avatar.cpp
+++ b/src/ponko_avatar.cpp
@@ -18,7 +18,7 @@ Avatar::Avatar()
     _face->createFromBmp(ponko_face_bmp, ponko_face_bmp_len);
 
     auto mc = new LGFX_Sprite();
-    assert(mc && "mo is nullptr");
+    assert(mc && "mc is nullptr");
     mc->createFromBmp(ponko_mouth_close_bmp, ponko_mouth_close_bmp_len);
     _mouth[Close] = mc;
     
diff --git a/src/wxbeacon2.cpp b/src/wxbeacon2.cpp
index b108167..0d2d74d 100644
--- a/src/wxbeacon2.cpp
+++ b/src/wxbeacon2.cpp
@@ -1,7 +1,6 @@
 /*!
   @file   wxbeacon2.cpp
   @brief  WxBeacon2 definitions [OMRON 2JCIE-BL01]
-  @note hardware independent
 */
 #include "wxbeacon2.hpp"
 #include <algorithm>
diff --git a/src/wxbeacon2.hpp b/src/wxbeacon2.hpp
index 4550cd0..42db098 100644
--- a/src/wxbeacon2.hpp
+++ b/src/wxbeacon2.hpp
@@ -1,7 +1,6 @@
 /*!
   @file   wxbeacon2.hpp
   @brief  WxBeacon2 definitions [OMRON 2JCIE-BL01]
-  @note independent
 */
 #ifndef WXBEACON2_HPP
 #define WXBEACON2_HPP
@@ -462,7 +461,7 @@ class WxBeacon2
 
         constexpr static uint16_t DEFAULT_VALUE = 300; // 300 sec => 5 min
         
-        /// @name Comvert
+        /// @name Convert
         /// @{
         explicit operator std::string() const { return std::string(_array.begin(), _array.end()); }
         bool from(const std::string& v);
@@ -483,7 +482,7 @@ class WxBeacon2
 
         explicit TimeInformation(time_t t = 0) : _time32(static_cast<uint32_t>(t)) {}
         
-        /// @name Comvert
+        /// @name Convert
         /// @{
         explicit operator std::string() const { return std::string(_array.begin(), _array.end()); }
         bool from(const std::string& v);
@@ -505,7 +504,7 @@ class WxBeacon2
 
         explicit LED(uint8_t d = DURATION_MIN) : _duration(d) {}
         
-        /// @name Comvert
+        /// @name Convert
         /// @{
         explicit operator std::string() const { return std::string(_array.begin(), _array.end()); }
         /// @}
@@ -548,7 +547,7 @@ class WxBeacon2
         bool hasError() const { return _sensor || _cpu || _battery; }
         void clear() { _array = {}; }
         
-        /// @name Comvert
+        /// @name Convert
         /// @{
         explicit operator std::string() const { return std::string(_array.begin(), _array.end()); }
         bool from(const std::string& v);
@@ -585,7 +584,7 @@ class WxBeacon2
         bool withDataRecordingMode() const { return WxBeacon2::withDataRecordingMode(beaconMode()); }
         bool withoutDataRecordingMode() const { return !WxBeacon2::withDataRecordingMode(beaconMode()); }
 
-        /// @name Comvert
+        /// @name Convert
         /// @{
         explicit operator std::string() const { return std::string(_array.begin(), _array.end()); }
         bool from(const std::string& v);
diff --git a/src/wxbeacon2_ble.hpp b/src/wxbeacon2_ble.hpp
index ae2c344..a9446e8 100644
--- a/src/wxbeacon2_ble.hpp
+++ b/src/wxbeacon2_ble.hpp
@@ -150,11 +150,6 @@ class WxBeacon2Client
     /// @}
     
   protected:
-    bool correctDeviceName();
-    bool correctDeviceInformation();
-    bool correctADVSetting();
-    bool correctTimeInformation();
-
     /*!
       @brief get rows from 1 page.
       @param page Read page no.