diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 0cc9c84bd..2f5b53c46 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -68,7 +68,7 @@ Rtklib_Pvt::Rtklib_Pvt(ConfigurationInterface* configuration,
     pvt_output_parameters.dump_filename = configuration->property(role + ".dump_filename", default_dump_filename);
     pvt_output_parameters.dump_mat = configuration->property(role + ".dump_mat", true);
 
-    //OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover
+    // OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover
     pvt_output_parameters.custom_year = configuration->property("GNSS-SDR.custom_year", 0);
 
     // output rate
diff --git a/src/algorithms/PVT/libs/pvt_solution.cc b/src/algorithms/PVT/libs/pvt_solution.cc
index ef53a9a44..1e06b7aed 100644
--- a/src/algorithms/PVT/libs/pvt_solution.cc
+++ b/src/algorithms/PVT/libs/pvt_solution.cc
@@ -53,7 +53,7 @@ Pvt_Solution::Pvt_Solution()
     d_valid_observations = 0;
     d_rx_pos = arma::zeros(3, 1);
     d_rx_dt_s = 0.0;
-    d_custom_year = 0;  //disabled by default
+    d_custom_year = 0;  // disabled by default
 }
 
 
diff --git a/src/algorithms/PVT/libs/pvt_solution.h b/src/algorithms/PVT/libs/pvt_solution.h
index 2ece97903..6f4d0ede8 100644
--- a/src/algorithms/PVT/libs/pvt_solution.h
+++ b/src/algorithms/PVT/libs/pvt_solution.h
@@ -130,7 +130,7 @@ public:
     int tropo(double *ddr_m, double sinel, double hsta_km, double p_mb, double t_kel, double hum, double hp_km, double htkel_km, double hhum_km);
 
 protected:
-    int d_custom_year;  //custom year to guess the correct week rollover in post processing mode
+    int d_custom_year;  // custom year to guess the correct week rollover in post processing mode
 private:
     double d_rx_dt_s;  // RX time offset [s]
 
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
index 80e62e341..d262022a1 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
@@ -2128,10 +2128,10 @@ int adjgpsweek(int week, int custom_year)
     //            w = week + 1024;  //add weeks from 6-january-1980 to week rollover in 21 august 1999
     //        }
     int w;
-    if (week>1023)
-    {
-      return week;
-    }
+    if (week > 1023)
+        {
+            return week;
+        }
 
     if (custom_year == 0)
         {
@@ -2146,15 +2146,15 @@ int adjgpsweek(int week, int custom_year)
         {
             if (custom_year >= 2019)
                 {
-                    w = week + 2048;  //add weeks from 6-january-1980 to week rollover in 6 april 2019
+                    w = week + 2048;  // add weeks from 6-january-1980 to week rollover in 6 april 2019
                 }
             else if (custom_year < 2019 and custom_year >= 1999)
                 {
-                    w = week + 1024;  //add weeks from 6-january-1980 to week rollover in 21 august 1999
+                    w = week + 1024;  // add weeks from 6-january-1980 to week rollover in 21 august 1999
                 }
             else
                 {
-                    w = week;  //no rollover
+                    w = week;  // no rollover
                 }
             return w;
         }
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 86f5903a0..6d9cd055d 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -116,7 +116,7 @@ ControlThread::ControlThread(const std::shared_ptr<ConfigurationInterface> &conf
 
 void ControlThread::init()
 {
-    //OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover
+    // OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover
     custom_year_ = configuration_->property("GNSS-SDR.custom_year", 0);
     // Instantiates a control queue, a GNSS flowgraph, and a control message factory
     control_queue_ = std::make_shared<Concurrent_Queue<pmt::pmt_t>>();
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index 1069d0b0c..b993f6d03 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -171,7 +171,7 @@ private:
     std::shared_ptr<GNSSFlowgraph> flowgraph_;
     std::shared_ptr<ConfigurationInterface> configuration_;
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> control_queue_;
-    int custom_year_;  //to override the system time to postprocess old gnss records and avoid wrong week rollover
+    int custom_year_;  // to override the system time to postprocess old gnss records and avoid wrong week rollover
     bool stop_;
     bool restart_;
     bool delete_configuration_;