diff --git a/src/algorithms/PVT/libs/pvt_solution.cc b/src/algorithms/PVT/libs/pvt_solution.cc
index 7c2417cd5..d9afed699 100644
--- a/src/algorithms/PVT/libs/pvt_solution.cc
+++ b/src/algorithms/PVT/libs/pvt_solution.cc
@@ -29,9 +29,9 @@
  * -------------------------------------------------------------------------
  */
 
-#include "pvt_solution.h"
 #include "GPS_L1_CA.h"
 #include "geofunctions.h"
+#include "pvt_solution.h"
 #include <glog/logging.h>
 #include <array>
 #include <cstddef>
@@ -414,7 +414,7 @@ void Pvt_Solution::set_rx_pos(const arma::vec &pos)
 }
 
 
-const arma::vec& Pvt_Solution::get_rx_pos() const
+arma::vec Pvt_Solution::get_rx_pos() const
 {
     return d_rx_pos;
 }
@@ -425,7 +425,7 @@ void Pvt_Solution::set_rx_vel(arma::vec vel)
 }
 
 
-const arma::vec& Pvt_Solution::get_rx_vel() const
+arma::vec Pvt_Solution::get_rx_vel() const
 {
     return d_rx_vel;
 }
diff --git a/src/algorithms/PVT/libs/pvt_solution.h b/src/algorithms/PVT/libs/pvt_solution.h
index ae8a6ab00..49b823576 100644
--- a/src/algorithms/PVT/libs/pvt_solution.h
+++ b/src/algorithms/PVT/libs/pvt_solution.h
@@ -53,11 +53,11 @@ public:
     double get_time_offset_s() const;            //!< Get RX time offset [s]
     void set_time_offset_s(double offset);       //!< Set RX time offset [s]
 
-    double get_clock_drift_ppm() const;    //!< Get the Rx clock drift [ppm]
-    void set_clock_drift_ppm(double clock_drift_ppm ); //!< Set the Rx clock drift [ppm]
-    double get_latitude() const;   //!< Get RX position Latitude WGS84 [deg]
-    double get_longitude() const;  //!< Get RX position Longitude WGS84 [deg]
-    double get_height() const;     //!< Get RX position height WGS84 [m]
+    double get_clock_drift_ppm() const;                //!< Get the Rx clock drift [ppm]
+    void set_clock_drift_ppm(double clock_drift_ppm);  //!< Set the Rx clock drift [ppm]
+    double get_latitude() const;                       //!< Get RX position Latitude WGS84 [deg]
+    double get_longitude() const;                      //!< Get RX position Longitude WGS84 [deg]
+    double get_height() const;                         //!< Get RX position height WGS84 [m]
 
     double get_speed_over_ground() const;          //!< Get RX speed over ground [m/s]
     void set_speed_over_ground(double speed_m_s);  //!< Set RX speed over ground [m/s]
@@ -134,8 +134,8 @@ public:
 protected:
     bool d_pre_2009_file;  // Flag to correct week rollover in post processing mode for signals older than 2009
 private:
-    double d_rx_dt_s;  // RX time offset [s]
-    double d_rx_clock_drift_ppm; // RX clock drift [ppm]
+    double d_rx_dt_s;             // RX time offset [s]
+    double d_rx_clock_drift_ppm;  // RX clock drift [ppm]
 
     double d_latitude_d;             // RX position Latitude WGS84 [deg]
     double d_longitude_d;            // RX position Longitude WGS84 [deg]
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index fdf249835..5809e84cf 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -51,7 +51,6 @@
  *
  * -----------------------------------------------------------------------*/
 
-#include "rtklib_solver.h"
 #include "Beidou_B1I.h"
 #include "Beidou_B3I.h"
 #include "Beidou_DNAV.h"
@@ -61,6 +60,7 @@
 #include "rtklib_conversions.h"
 #include "rtklib_rtkpos.h"
 #include "rtklib_solution.h"
+#include "rtklib_solver.h"
 #include <glog/logging.h>
 #include <matio.h>
 #include <exception>
@@ -1076,18 +1076,18 @@ bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
                     pos[0] = rx_position_and_time(0);
                     pos[1] = rx_position_and_time(1);
                     pos[2] = rx_position_and_time(2);
-                    ecef2enu( pos, &pvt_sol.rr[3], vel_enu );
+                    ecef2enu(pos, &pvt_sol.rr[3], vel_enu);
 
                     arma::vec rx_vel_enu(3);
-                    rx_vel_enu(0) = vel_enu[ 0 ];
-                    rx_vel_enu(1) = vel_enu[ 1 ];
-                    rx_vel_enu(2) = vel_enu[ 2 ];
+                    rx_vel_enu(0) = vel_enu[0];
+                    rx_vel_enu(1) = vel_enu[1];
+                    rx_vel_enu(2) = vel_enu[2];
 
-                    this->set_rx_vel( rx_vel_enu );
+                    this->set_rx_vel(rx_vel_enu);
 
-                    double clock_drift_ppm = pvt_sol.dtr[5] / GPS_C_m_s *1e6;
+                    double clock_drift_ppm = pvt_sol.dtr[5] / GPS_C_m_s * 1e6;
 
-                    this->set_clock_drift_ppm( clock_drift_ppm );
+                    this->set_clock_drift_ppm(clock_drift_ppm);
 
                     // ######## LOG FILE #########
                     if (d_flag_dump_enabled == true)