diff --git a/platformio.ini b/platformio.ini
index 1642536e..6de070cb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -29,7 +29,7 @@ description = Paxcounter is a proof-of-concept ESP32 device for metering passeng
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 1.6.93
+release_version = 1.6.95
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 0
diff --git a/src/bme680mems.cpp b/src/bme680mems.cpp
index 88ed85b2..6203d928 100644
--- a/src/bme680mems.cpp
+++ b/src/bme680mems.cpp
@@ -163,14 +163,6 @@ void state_save(const uint8_t *state_buffer, uint32_t length) {
   // ...
 }
 
-/*!
- * @brief           Load library config from non-volatile memory
- *
- * @param[in,out]   config_buffer    buffer to hold the loaded state string
- * @param[in]       n_buffer        size of the allocated state buffer
- *
- * @return          number of bytes copied to config_buffer
- */
 uint32_t config_load(uint8_t *config_buffer, uint32_t n_buffer) {
 
   // Load a library config from non-volatile memory, if available.
@@ -181,12 +173,6 @@ uint32_t config_load(uint8_t *config_buffer, uint32_t n_buffer) {
   return sizeof(bsec_config_iaq);
 }
 
-/*!
- * @brief           Interrupt handler for press of a ULP plus button
- *
- * @return          none
- */
-
 void user_delay_ms(uint32_t period) { vTaskDelay(period / portTICK_PERIOD_MS); }
 
 int64_t get_timestamp_us() { return (int64_t)millis() * 1000; }
diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index 01713d0a..9102376c 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -9,18 +9,18 @@ static const char TAG[] = "lora";
 osjob_t sendjob;
 QueueHandle_t LoraSendQueue;
 
-class cMyHalConfig_t : public Arduino_LMIC::HalConfiguration_t {
+class MyHalConfig_t : public Arduino_LMIC::HalConfiguration_t {
 
 public:
-  cMyHalConfig_t(){};
+  MyHalConfig_t(){};
   virtual void begin(void) override {
     SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
   }
 };
 
-cMyHalConfig_t myHalConfig{};
+MyHalConfig_t myHalConfig{};
 
-// LMIC enhanced Pin mapping
+// LMIC pin mapping
 const lmic_pinmap lmic_pins = {
     .nss = LORA_CS,
     .rxtx = LMIC_UNUSED_PIN,