diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index 50e541020..9196a0968 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -368,8 +368,8 @@ public:
     void run_server();   //<! Starts running the server
     void stop_server();  //<! Stops the server
 
-    void send_message(const std::string& msg);      //<! Sends a message through the server to all connected clients
-    bool is_server_running() const;                 //<! Returns true if the server is running, false otherwise
+    void send_message(const std::string& msg);  //<! Sends a message through the server to all connected clients
+    bool is_server_running() const;             //<! Returns true if the server is running, false otherwise
 
 private:
     //
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
index 823175d08..9e4bdd65f 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
@@ -63,7 +63,7 @@ typedef struct
     uint8_t prn;                                                       /**< SV PRN. 0..31 */
     uint8_t msg_id;                                                    /**< Message id. 0..31 */
     uint32_t tow;                                                      /**< GPS ToW in 6-second units. Multiply to 6 to get seconds. */
-    bool alert;                                                   /**< CNAV message alert flag */
+    bool alert;                                                        /**< CNAV message alert flag */
     uint8_t raw_msg[GPS_L2C_V27_DECODE_BITS + GPS_L2C_V27_DELAY_BITS]; /**< RAW MSG for GNSS-SDR */
 } cnav_msg_t;
 
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index 0fe3674fc..d8fb5584c 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -93,7 +93,7 @@ public:
      *
      * \param[in] boost::shared_ptr<gr::msg_queue> control_queue
      */
-    void set_control_queue(const gr::msg_queue::sptr control_queue); // NOLINT(performance-unnecessary-value-param)
+    void set_control_queue(const gr::msg_queue::sptr control_queue);  // NOLINT(performance-unnecessary-value-param)
 
 
     unsigned int processed_control_messages()
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index d9c153794..2b2acc8b6 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -58,7 +58,7 @@ public:
     GNSSBlockFactory();
     virtual ~GNSSBlockFactory();
     std::unique_ptr<GNSSBlockInterface> GetSignalSource(const std::shared_ptr<ConfigurationInterface>& configuration,
-        const gr::msg_queue::sptr queue, int ID = -1); // NOLINT(performance-unnecessary-value-param)
+        const gr::msg_queue::sptr queue, int ID = -1);  // NOLINT(performance-unnecessary-value-param)
 
     std::unique_ptr<GNSSBlockInterface> GetSignalConditioner(const std::shared_ptr<ConfigurationInterface>& configuration, int ID = -1);
 
@@ -67,7 +67,7 @@ public:
     std::unique_ptr<GNSSBlockInterface> GetObservables(const std::shared_ptr<ConfigurationInterface>& configuration);
 
     std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GetChannels(const std::shared_ptr<ConfigurationInterface>& configuration,
-        const gr::msg_queue::sptr queue); // NOLINT(performance-unnecessary-value-param)
+        const gr::msg_queue::sptr queue);  // NOLINT(performance-unnecessary-value-param)
 
     /*
      * \brief Returns the block with the required configuration and implementation
@@ -75,7 +75,7 @@ public:
     std::unique_ptr<GNSSBlockInterface> GetBlock(const std::shared_ptr<ConfigurationInterface>& configuration,
         const std::string& role, const std::string& implementation,
         unsigned int in_streams, unsigned int out_streams,
-        const gr::msg_queue::sptr queue = nullptr); // NOLINT(performance-unnecessary-value-param)
+        const gr::msg_queue::sptr queue = nullptr);  // NOLINT(performance-unnecessary-value-param)
 
 private:
     std::unique_ptr<GNSSBlockInterface> GetChannel_1C(const std::shared_ptr<ConfigurationInterface>& configuration,
diff --git a/src/core/system_parameters/GLONASS_L1_L2_CA.h b/src/core/system_parameters/GLONASS_L1_L2_CA.h
index bcb414e48..b8c796b4f 100644
--- a/src/core/system_parameters/GLONASS_L1_L2_CA.h
+++ b/src/core/system_parameters/GLONASS_L1_L2_CA.h
@@ -48,7 +48,7 @@ const double GLONASS_PI = 3.1415926535898;                     //!< Pi as define
 const double GLONASS_TWO_PI = 6.283185307179586;               //!< 2Pi as defined in IS-GPS-200E
 const double GLONASS_OMEGA_EARTH_DOT = 7.292115e-5;            //!< Earth rotation rate, [rad/s]
 const double GLONASS_GM = 398600.4418e9;                       //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2]
-const double GLONASS_F_M_A = 0.35e9;                            //!< Gravitational constant of atmosphere [m^3/s^2]
+const double GLONASS_F_M_A = 0.35e9;                           //!< Gravitational constant of atmosphere [m^3/s^2]
 const double GLONASS_SEMI_MAJOR_AXIS = 6378136;                //!< Semi-major axis of Earth [m]
 const double GLONASS_FLATTENING = 1 / 29825784;                //!< Flattening parameter
 const double GLONASS_GRAVITY = 97803284;                       //!< Equatorial acceleration of gravity [mGal]
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 651176ea7..ee5fc3896 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -169,18 +169,18 @@ const double AI1_5_LSB = TWO_N8;
 const std::vector<std::pair<int32_t, int32_t>> AI2_5_BIT({{29, 14}});  //
 const double AI2_5_LSB = TWO_N15;
 /*Ionospheric disturbance flag*/
-const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}});     //
+const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}});      //
 const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5A_5_BIT({{48, 10}});  //
 const double BGD_E1_E5A_5_LSB = TWO_N32;
 const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5B_5_BIT({{58, 10}});  //
 const double BGD_E1_E5B_5_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}});   //
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}});    //
 const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_5_BIT({{70, 2}});   //
-const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}});  //
+const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}});   //
 const std::vector<std::pair<int32_t, int32_t>> E1_B_DVS_5_BIT({{73, 1}});  //
 /*GST*/
 const std::vector<std::pair<int32_t, int32_t>> WN_5_BIT({{74, 12}});