diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
index 2170577ff..e156cdb25 100644
--- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
@@ -105,11 +105,11 @@ public:
 
 private:
     std::vector<gr::blocks::file_source::sptr> file_source_vec_;
-    #if GNURADIO_USES_STD_POINTERS
-        std::shared_ptr<gr::block> valve_;
-    #else
-        boost::shared_ptr<gr::block> valve_;
-    #endif
+#if GNURADIO_USES_STD_POINTERS
+    std::shared_ptr<gr::block> valve_;
+#else
+    boost::shared_ptr<gr::block> valve_;
+#endif
     gr::blocks::file_sink::sptr sink_;
     std::vector<gr::blocks::throttle::sptr> throttle_vec_;
     std::vector<std::string> filename_vec_;
diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
index 3ffa35d21..20644af39 100644
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
@@ -105,11 +105,11 @@ public:
 private:
     gr::blocks::file_source::sptr file_source_;
     gr::blocks::deinterleave::sptr deint_;
-    #if GNURADIO_USES_STD_POINTERS
-        std::vector<std::shared_ptr<gr::block>> valve_vec_;
-    #else
-        std::vector<boost::shared_ptr<gr::block>> valve_vec_;
-    #endif
+#if GNURADIO_USES_STD_POINTERS
+    std::vector<std::shared_ptr<gr::block>> valve_vec_;
+#else
+    std::vector<boost::shared_ptr<gr::block>> valve_vec_;
+#endif
     std::vector<gr::blocks::endian_swap::sptr> endian_vec_;
     std::vector<gr::blocks::null_sink::sptr> null_sinks_;
     std::vector<unpack_spir_gss6450_samples_sptr> unpack_spir_vec_;
diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
index c740b8be7..0407589eb 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
@@ -87,7 +87,9 @@ private:
 
     boost::thread *d_pcap_thread;
     boost::mutex d_mutex;
-    struct sockaddr_in si_me{};
+    struct sockaddr_in si_me
+    {
+    };
     std::string d_src_device;
     std::string d_origin_address;
     pcap_t *descr;  // ethernet pcap device descriptor
diff --git a/src/algorithms/tracking/libs/cuda_multicorrelator.h b/src/algorithms/tracking/libs/cuda_multicorrelator.h
index 89f643370..8e910d0b8 100644
--- a/src/algorithms/tracking/libs/cuda_multicorrelator.h
+++ b/src/algorithms/tracking/libs/cuda_multicorrelator.h
@@ -134,7 +134,7 @@ public:
 private:
     cudaStream_t stream1;
     // cudaStream_t stream2;
-    
+
     // Allocate the device input vectors
     GPU_Complex* d_sig_in;
     GPU_Complex* d_nco_in;
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 9e9b1b3cc..d20614431 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -114,7 +114,7 @@ void GNSSFlowgraph::start()
 
 void GNSSFlowgraph::stop()
 {
-    for (auto chan : channels_)
+    for (const auto& chan : channels_)
         {
             chan->stop_channel();  // stop the acquisition or tracking operation
         }