diff --git a/platformio.ini b/platformio.ini
index 9d54a245..5e9d4d94 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -8,6 +8,7 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
+
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
 env_default = heltec_wifi_lora_32
@@ -20,8 +21,12 @@ env_default = heltec_wifi_lora_32
 ;
 description = Paxcounter is a proof-of-concept ESP32 device for metering passenger flows in realtime. It counts how many mobile devices are around.
 
-;----------- common part -----------
 [common_env_data]
+monitor_baud = 115200
+lib_deps_display =
+    U8g2@>=2.22.14
+lib_deps_rgbled =
+    SmartLeds
 build_flags = 
 ; we need build_flag for logging, otherwise we can't use ESP_LOGx in arduino framework
 ; ---> NOTE: For production run set DEBUG_LEVEL level to NONE! <---
@@ -35,20 +40,11 @@ build_flags =
 ; override lora settings from LMiC library in lmic/config.h and use main.h instead
     -D_lmic_config_h_
     -include "src/main.h"
-;
-lib_deps_display =
-    U8g2@>=2.22.14
-lib_deps_rgbled =
-    SmartLeds
-;
-;
-;----------- hardware specific part -----------
 
 [env:heltec_wifi_lora_32]
 platform = espressif32
-board = heltec_wifi_lora_32
 framework = arduino
-monitor_baud = 115200
+board = heltec_wifi_lora_32
 upload_speed = 115200
 lib_deps = 
     ${common_env_data.lib_deps_display}
@@ -59,9 +55,8 @@ build_flags =
 
 [env:ttgov1]
 platform = espressif32
-board = esp32dev
 framework = arduino
-monitor_baud = 115200
+board = esp32dev
 upload_speed = 115200 
 lib_deps = 
     ${common_env_data.lib_deps_display}
@@ -72,9 +67,8 @@ build_flags =
 
 [env:ttgov2]
 platform = espressif32
-board = esp32dev
 framework = arduino
-monitor_baud = 115200
+board = esp32dev
 upload_speed = 921600
 lib_deps = 
     ${common_env_data.lib_deps_display}
@@ -85,9 +79,8 @@ build_flags =
 
 [env:lopy]
 platform = espressif32
-board = esp32dev
 framework = arduino
-monitor_baud = 115200
+board = esp32dev
 upload_speed = 921600
 lib_deps = 
     ${common_env_data.lib_deps_rgbled}
@@ -98,9 +91,8 @@ build_flags =
 
 [env:lopy4]
 platform = espressif32
-board = esp32dev
 framework = arduino
-monitor_baud = 115200
+board = esp32dev
 upload_speed = 921600
 lib_deps =
     ${common_env_data.lib_deps_rgbled}
@@ -111,9 +103,8 @@ build_flags =
 
 [env:lolin32lite_lora]
 platform = espressif32
-board = lolin32
 framework = arduino
-monitor_baud = 115200
+board = lolin32
 upload_speed = 256000
 lib_deps = 
     ${common_env_data.lib_deps_rgbled}
@@ -124,9 +115,8 @@ build_flags =
 
 [env:lolin32_lora]
 platform = espressif32
+framework = arduino 
 board = lolin32
-framework = arduino
-monitor_baud = 115200
 upload_speed = 921600
 lib_deps = 
     ${common_env_data.lib_deps_rgbled}