diff --git a/src/core/libs/INIReader.h b/src/core/libs/INIReader.h
index 4dcfc223a..b32c9a598 100644
--- a/src/core/libs/INIReader.h
+++ b/src/core/libs/INIReader.h
@@ -53,11 +53,12 @@ public:
     int64_t GetInteger(const std::string& section, const std::string& name, int64_t default_value);
 
 private:
-    int _error;
-    std::map<std::string, std::string> _values;
     static std::string MakeKey(const std::string& section, const std::string& name);
     static int ValueHandler(void* user, const char* section, const char* name,
         const char* value);
+
+    std::map<std::string, std::string> _values;
+    int _error;
 };
 
 #endif  // GNSS_SDR_INIREADER_H
diff --git a/src/core/libs/channel_status_msg_receiver.h b/src/core/libs/channel_status_msg_receiver.h
index 6c305e06c..e11a2b2d5 100644
--- a/src/core/libs/channel_status_msg_receiver.h
+++ b/src/core/libs/channel_status_msg_receiver.h
@@ -62,9 +62,9 @@ public:
 private:
     friend channel_status_msg_receiver_sptr channel_status_msg_receiver_make();
     channel_status_msg_receiver();
-    std::map<int, std::shared_ptr<Gnss_Synchro>> d_channel_status_map;
-    Monitor_Pvt d_pvt_status{};
     void msg_handler_events(const pmt::pmt_t& msg);
+    Monitor_Pvt d_pvt_status{};
+    std::map<int, std::shared_ptr<Gnss_Synchro>> d_channel_status_map;
 };
 
 #endif  // GNSS_SDR_CHANNEL_STATUS_MSG_RECEIVER_CC_H
diff --git a/src/core/libs/gnss_sdr_fpga_sample_counter.h b/src/core/libs/gnss_sdr_fpga_sample_counter.h
index 7c958f021..41073661a 100644
--- a/src/core/libs/gnss_sdr_fpga_sample_counter.h
+++ b/src/core/libs/gnss_sdr_fpga_sample_counter.h
@@ -62,30 +62,31 @@ private:
     void close_device(void);
     void open_device(void);
     bool start();
-
     bool stop();
     void wait_for_interrupt(void);
-    uint32_t samples_per_output;
-    uint32_t samples_per_report;
+
+    volatile uint32_t *map_base;            // driver memory map
+    std::string device_name = "/dev/uio2";  // HW device name
+
     double fs;
     uint64_t sample_counter;
     uint64_t last_sample_counter;
-
-    uint32_t interval_ms;
     uint64_t current_T_rx_ms;  // Receiver time in ms since the beginning of the run
-    uint32_t current_s;        // Receiver time in seconds, modulo 60
-    bool flag_m;               // True if the receiver has been running for at least 1 minute
-    uint32_t current_m;        // Receiver time in minutes, modulo 60
-    bool flag_h;               // True if the receiver has been running for at least 1 hour
-    uint32_t current_h;        // Receiver time in hours, modulo 24
-    bool flag_days;            // True if the receiver has been running for at least 1 day
-    uint32_t current_days;     // Receiver time in days since the beginning of the run
+
+    uint32_t samples_per_output;
+    uint32_t samples_per_report;
+    uint32_t interval_ms;
+    uint32_t current_s;     // Receiver time in seconds, modulo 60
+    uint32_t current_m;     // Receiver time in minutes, modulo 60
+    uint32_t current_h;     // Receiver time in hours, modulo 24
+    uint32_t current_days;  // Receiver time in days since the beginning of the run
     int32_t report_interval_ms;
+    int32_t fd;  // driver descriptor
 
     bool flag_enable_send_msg;
-    int32_t fd;                             // driver descriptor
-    volatile uint32_t *map_base;            // driver memory map
-    std::string device_name = "/dev/uio2";  // HW device name
+    bool flag_m;     // True if the receiver has been running for at least 1 minute
+    bool flag_h;     // True if the receiver has been running for at least 1 hour
+    bool flag_days;  // True if the receiver has been running for at least 1 day
     bool is_open;
 };
 
diff --git a/src/core/libs/gnss_sdr_sample_counter.h b/src/core/libs/gnss_sdr_sample_counter.h
index f1d0d4aaa..810d05c25 100644
--- a/src/core/libs/gnss_sdr_sample_counter.h
+++ b/src/core/libs/gnss_sdr_sample_counter.h
@@ -62,19 +62,19 @@ private:
         int32_t _interval_ms,
         size_t _size);
 
-    uint32_t samples_per_output;
     double fs;
+    int64_t current_T_rx_ms;  // Receiver time in ms since the beginning of the run
     uint64_t sample_counter;
     int32_t interval_ms;
-    int64_t current_T_rx_ms;  // Receiver time in ms since the beginning of the run
-    uint32_t current_s;       // Receiver time in seconds, modulo 60
-    bool flag_m;              // True if the receiver has been running for at least 1 minute
-    uint32_t current_m;       // Receiver time in minutes, modulo 60
-    bool flag_h;              // True if the receiver has been running for at least 1 hour
-    uint32_t current_h;       // Receiver time in hours, modulo 24
-    bool flag_days;           // True if the receiver has been running for at least 1 day
-    uint32_t current_days;    // Receiver time in days since the beginning of the run
     int32_t report_interval_ms;
+    uint32_t samples_per_output;
+    uint32_t current_s;     // Receiver time in seconds, modulo 60
+    uint32_t current_m;     // Receiver time in minutes, modulo 60
+    uint32_t current_h;     // Receiver time in hours, modulo 24
+    uint32_t current_days;  // Receiver time in days since the beginning of the run
+    bool flag_m;            // True if the receiver has been running for at least 1 minute
+    bool flag_h;            // True if the receiver has been running for at least 1 hour
+    bool flag_days;         // True if the receiver has been running for at least 1 day
     bool flag_enable_send_msg;
 };
 
diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h
index 326fc65ba..75a2ccc88 100644
--- a/src/core/libs/gnss_sdr_supl_client.h
+++ b/src/core/libs/gnss_sdr_supl_client.h
@@ -252,16 +252,16 @@ public:
     void print_assistance();
 
 private:
+    bool read_gal_almanac_from_gsa(const std::string& file_name);
+    // assistance protocol structure
+    supl_ctx_t ctx{};
+    // assistance data
+    supl_assist_t assist{};
     // GSM CELL INFO
     int mcc;
     int mns;
     int lac;
     int ci;
-    // assistance protocol structure
-    supl_ctx_t ctx{};
-    // assistance data
-    supl_assist_t assist{};
-    bool read_gal_almanac_from_gsa(const std::string& file_name);
 };
 
 #endif  // GNSS_SDR_SUPL_CLIENT_H
diff --git a/src/core/libs/gnss_sdr_time_counter.h b/src/core/libs/gnss_sdr_time_counter.h
index f3f583fde..49f7607db 100644
--- a/src/core/libs/gnss_sdr_time_counter.h
+++ b/src/core/libs/gnss_sdr_time_counter.h
@@ -43,16 +43,17 @@ public:
 
 private:
     gnss_sdr_time_counter();
-    int64_t current_T_rx_ms;  // Receiver time in ms since the beginning of the run
-    uint32_t current_s;       // Receiver time in seconds, modulo 60
-    bool flag_m;              // True if the receiver has been running for at least 1 minute
-    uint32_t current_m;       // Receiver time in minutes, modulo 60
-    bool flag_h;              // True if the receiver has been running for at least 1 hour
-    uint32_t current_h;       // Receiver time in hours, modulo 24
-    bool flag_days;           // True if the receiver has been running for at least 1 day
-    uint32_t current_days;    // Receiver time in days since the beginning of the run
-    int32_t report_interval_ms;
     friend gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter();
+
+    int64_t current_T_rx_ms;  // Receiver time in ms since the beginning of the run
+    int32_t report_interval_ms;
+    uint32_t current_s;     // Receiver time in seconds, modulo 60
+    uint32_t current_m;     // Receiver time in minutes, modulo 60
+    uint32_t current_h;     // Receiver time in hours, modulo 24
+    uint32_t current_days;  // Receiver time in days since the beginning of the run
+    bool flag_m;            // True if the receiver has been running for at least 1 minute
+    bool flag_h;            // True if the receiver has been running for at least 1 hour
+    bool flag_days;         // True if the receiver has been running for at least 1 day
 };
 
 #endif  // GNSS_SDR_GNSS_SDR_SAMPLE_COUNTER_H