diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index 6a83c8875..189267b7d 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -15,7 +15,7 @@
  * GNSS-SDR is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
+ * (at your option) any later version.
  *
  * GNSS-SDR is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,8 +41,6 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
-#include "sbas_telemetry_data.h"
-
 
 
 using google::LogMessage;
@@ -57,7 +55,6 @@ Rinex_Printer::Rinex_Printer()
     sbsfilename = Rinex_Printer::createFilename("RINEX_FILE_TYPE_SBAS");
     navGalfilename = Rinex_Printer::createFilename("RINEX_FILE_TYPE_GAL_NAV");
 
-
     Rinex_Printer::navFile.open(navfilename, std::ios::out | std::ios::app);
     Rinex_Printer::obsFile.open(obsfilename, std::ios::out | std::ios::app);
     Rinex_Printer::sbsFile.open(sbsfilename, std::ios::out | std::ios::app);
@@ -1093,7 +1090,7 @@ void Rinex_Printer::log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephe
             // -------- BROADCAST ORBIT - 1
             line.clear();
             line += std::string(5, ' ');
-            line += Rinex_Printer::doub2for(galileo_ephemeris_iter->second.IOD_ephemeris, 18, 2);
+            line += Rinex_Printer::doub2for(static_cast<double>(galileo_ephemeris_iter->second.IOD_ephemeris), 18, 2);
             line += std::string(1, ' ');
             line += Rinex_Printer::doub2for(galileo_ephemeris_iter->second.C_rs_3, 18, 2);
             line += std::string(1, ' ');
@@ -1118,7 +1115,6 @@ void Rinex_Printer::log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephe
             out << line << std::endl;
 
 
-
             // -------- BROADCAST ORBIT - 3
             line.clear();
             line += std::string(5, ' ');
@@ -1133,8 +1129,6 @@ void Rinex_Printer::log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephe
             out << line << std::endl;
 
 
-
-
             // -------- BROADCAST ORBIT - 4
             line.clear();
             line += std::string(5, ' ');
@@ -1149,7 +1143,6 @@ void Rinex_Printer::log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephe
             out << line << std::endl;
 
 
-
             // -------- BROADCAST ORBIT - 5
             line.clear();
             line += std::string(5, ' ');
@@ -1859,7 +1852,6 @@ void Rinex_Printer::log_rinex_obs(std::ofstream& out, Galileo_Ephemeris eph, dou
     std::string hour (timestring, 9, 2);
     std::string minutes (timestring, 11, 2);
 
-
     std::string year (timestring, 0, 4);
     line += std::string(1, '>');
     line += std::string(1, ' ');
@@ -1896,7 +1888,6 @@ void Rinex_Printer::log_rinex_obs(std::ofstream& out, Galileo_Ephemeris eph, dou
         }
     line += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(numSatellitesObserved), 3);
 
-
     // Receiver clock offset (optional)
     //line += rightJustify(asString(clockOffset, 12), 15);
 
@@ -1942,8 +1933,6 @@ void Rinex_Printer::log_rinex_obs(std::ofstream& out, Galileo_Ephemeris eph, dou
 // -> Leap years are considered, but leap seconds not.
 void Rinex_Printer::to_date_time(int gps_week, int gps_tow, int &year, int &month, int &day, int &hour, int &minute, int &second)
 {
-    //std::cout << "to_date_time(): gps_week=" << gps_week << " gps_tow=" << gps_tow << std::endl;
-
     int days_per_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
     // seconds in a not leap year
@@ -2010,7 +1999,6 @@ void Rinex_Printer::to_date_time(int gps_week, int gps_tow, int &year, int &mont
 }
 
 
-
 void Rinex_Printer::log_rinex_sbs(std::ofstream& out, Sbas_Raw_Msg sbs_message)
 {
     // line 1: PRN / EPOCH / RCVR
@@ -2094,8 +2082,6 @@ void Rinex_Printer::log_rinex_sbs(std::ofstream& out, Sbas_Raw_Msg sbs_message)
 }
 
 
-
-
 int Rinex_Printer::signalStrength(double snr)
 {
     int ss;
@@ -2114,6 +2100,7 @@ boost::posix_time::ptime Rinex_Printer::compute_UTC_time(Gps_Navigation_Message
     return p_time;
 }
 
+
 boost::posix_time::ptime Rinex_Printer::compute_GPS_time(Gps_Ephemeris eph, double obs_time)
 {
     // The RINEX v2.11 v3.00 format uses GPS time for the observations epoch, not UTC time, thus, no leap seconds needed here.
@@ -2121,13 +2108,12 @@ boost::posix_time::ptime Rinex_Printer::compute_GPS_time(Gps_Ephemeris eph, doub
     // (see Pag. 17 in http://igscb.jpl.nasa.gov/igscb/data/format/rinex300.pdf)
     // --??? No time correction here, since it will be done in the RINEX processor
     double gps_t = obs_time;
-    boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800*(double)(eph.i_GPS_week%1024))*1000);
+    boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800*(double)(eph.i_GPS_week % 1024))*1000);
     boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
     return p_time;
 }
 
 
-
 boost::posix_time::ptime Rinex_Printer::compute_Galileo_time(Galileo_Ephemeris eph, double obs_time)
 {
     // The RINEX v2.11 v3.00 format uses GPS time for the observations epoch, not UTC time, thus, no leap seconds needed here.
@@ -2135,11 +2121,12 @@ boost::posix_time::ptime Rinex_Printer::compute_Galileo_time(Galileo_Ephemeris e
     // (see Pag. 17 in http://igscb.jpl.nasa.gov/igscb/data/format/rinex300.pdf)
     // --??? No time correction here, since it will be done in the RINEX processor
     double galileo_t = obs_time;
-    boost::posix_time::time_duration t = boost::posix_time::millisec((galileo_t + 604800*(double)(eph.WN_5))*1000);
+    boost::posix_time::time_duration t = boost::posix_time::millisec((galileo_t + 604800*(double)(eph.WN_5))*1000); //
     boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
     return p_time;
 }
 
+
 /*
 
 enum RINEX_enumMarkerType {
diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h
index f377b5a8d..52a0e0340 100644
--- a/src/algorithms/PVT/libs/rinex_printer.h
+++ b/src/algorithms/PVT/libs/rinex_printer.h
@@ -35,7 +35,7 @@
  * GNSS-SDR is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
+ * (at your option) any later version.
  *
  * GNSS-SDR is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -60,6 +60,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include "gps_navigation_message.h"
 #include "galileo_navigation_message.h"
+#include "sbas_telemetry_data.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
 #include "gnss_synchro.h"
@@ -89,20 +90,26 @@ public:
     std::ofstream navGalFile ; //<! Output file stream for RINEX Galileo navigation data file
 
     /*!
-     *  \brief Generates the Navigation Data header
+     *  \brief Generates the GPS Navigation Data header
      */
     void rinex_nav_header(std::ofstream& out, Gps_Iono iono, Gps_Utc_Model utc_model);
 
+    /*!
+     *  \brief Generates the Galileo Navigation Data header
+     */
     void rinex_nav_header(std::ofstream& out, Galileo_Iono iono, Galileo_Utc_Model utc_model);
 
     /*!
-     *  \brief Generates the Observation data header
+     *  \brief Generates the GPS Observation data header
      */
     void rinex_obs_header(std::ofstream& out, Gps_Ephemeris eph, double d_TOW_first_observation);
 
-    void rinex_obs_header(std::ofstream& out, Galileo_Ephemeris eph, double d_TOW_first_observation);
     /*!
+     *  \brief Generates the Galileo Observation data header
+     */
+    void rinex_obs_header(std::ofstream& out, Galileo_Ephemeris eph, double d_TOW_first_observation);
 
+    /*!
      *  \brief Generates the SBAS raw data header
      */
     void rinex_sbs_header(std::ofstream& out);
@@ -117,19 +124,29 @@ public:
      */
     boost::posix_time::ptime compute_GPS_time(Gps_Ephemeris eph, double obs_time);
 
-    boost::posix_time::ptime compute_Galileo_time(Galileo_Ephemeris eph, double obs_time);
     /*!
-     *  \brief Writes data from the navigation message into the RINEX file
+     *  \brief Computes the Galileo time and returns a boost::posix_time::ptime object
+     */
+    boost::posix_time::ptime compute_Galileo_time(Galileo_Ephemeris eph, double obs_time);
+
+    /*!
+     *  \brief Writes data from the GPS navigation message into the RINEX file
      */
     void log_rinex_nav(std::ofstream& out, std::map<int,Gps_Ephemeris> eph_map);
 
+    /*!
+     *  \brief Writes data from the Galileo navigation message into the RINEX file
+     */
     void log_rinex_nav(std::ofstream& out, std::map<int, Galileo_Ephemeris> eph_map);
 
     /*!
-     *  \brief Writes observables into the RINEX file
+     *  \brief Writes GPS observables into the RINEX file
      */
     void log_rinex_obs(std::ofstream& out, Gps_Ephemeris eph, double obs_time, std::map<int,Gnss_Synchro> pseudoranges);
 
+    /*!
+     *  \brief Writes Galileo observables into the RINEX file
+     */
     void log_rinex_obs(std::ofstream& out, Galileo_Ephemeris eph, double obs_time, std::map<int,Gnss_Synchro> pseudoranges);
 
     /*!