diff --git a/src/config/Alerts.h b/src/config/Alerts.h
index 14e9ef6..9baf6fc 100644
--- a/src/config/Alerts.h
+++ b/src/config/Alerts.h
@@ -11,7 +11,7 @@
  * clearing the levels and retriggering them the next time.
  */
 
-#define ALERTS_ON_SERIAL _DEBUG										///< Display alerts on serial when connected rather than sending an SMS.
+#define ALERTS_ON_SERIAL _DEBUG								///< Display alerts on serial when connected rather than sending an SMS.
 #define CONFIG_BATTERY_ALERT_LEVEL1			45				///< Battery percentage at which to trigger the first low battery alert.
 #define CONFIG_BATTERY_ALERT_LEVEL2			38				///< Battery percentage at which to trigger the final low battery alert.
 #define CONFIG_BATTERY_ALERT_CLEAR			60				///< Battery percentage at which to clear all battery alerts.
diff --git a/src/config/BackupNetwork.h b/src/config/BackupNetwork.h
index edf8f8f..afc3855 100644
--- a/src/config/BackupNetwork.h
+++ b/src/config/BackupNetwork.h
@@ -9,8 +9,8 @@
 #define POSITIONS_CONFIG_NET_URL				"http://yourserver.com/endpoint"	///< URL to which positions data will be send through an HTTP POST request
 #define POSITIONS_CONFIG_NET_EXPECTED_RESPONSE	201									///< Expected response code from the server that indicates that the positions has been successfully backuped.
 #define POSITIONS_CONFIG_NET_UNAVAILABLE_NETWORK_POSTPONE_THRESHOLD		5			///< Determines how many times to deal with an unreliable network before postponing the backup.
-																							///< In an area where cell reception isn't good, this avoid to try to backup the positions
-																							///< every single time, which would rapidly consumes all the battery.
+																					///< In an area where cell reception isn't good, this avoid to try to backup the positions
+																					///< every single time, which would rapidly consumes all the battery.
 
 struct networkConfig_t {
 	uint8_t saveThreshold;		//sizeof = 1
diff --git a/src/config/Gps.h b/src/config/Gps.h
index e0b45ae..e5d56bb 100644
--- a/src/config/Gps.h
+++ b/src/config/Gps.h
@@ -6,7 +6,7 @@
 
 #define GPS_INTERMEDIATE_TIMEOUT_MS				10000L	///< Time to sleeps between each GPS signal assessment.
 #define GPS_TOTAL_TIMEOUT_MS					80000L	///< Timeout after which to stop trying to get a GPS signal.
-#define GPS_MISSED_POSITION_GAP_KM	2					///< Gap between the current and previous position above which to consider
+#define GPS_MISSED_POSITION_GAP_KM				2		///< Gap between the current and previous position above which to consider
 														///< that the tracker has moved. Even if stopped, this will trigger a whole
 														///< new "cycle" of positions acquisition, and will avoid missing positions
 														///< because while moving, the tracker woke up while stopped at a light traffic for instance.
\ No newline at end of file
diff --git a/src/config/Hardware.h b/src/config/Hardware.h
index a585d49..f0c7255 100644
--- a/src/config/Hardware.h
+++ b/src/config/Hardware.h
@@ -5,7 +5,7 @@
 #include <E24.h>
 #include <SoftwareSerial.h>
 
-#define E24_ADDRESS 	E24_ADDR				///< I2C address of the 24xxx chip
+#define E24_ADDRESS 	E24_ADDR						///< I2C address of the 24xxx chip
 #define E24_SIZE		E24Size_t::E24_512K				///< 24xxx chip size
 
 #define SIM808_BAUDRATE 4800							///< Control the baudrate use to communicate with the SIM808 module
diff --git a/src/config/Sleeps.h b/src/config/Sleeps.h
index e186306..4405eb9 100644
--- a/src/config/Sleeps.h
+++ b/src/config/Sleeps.h
@@ -7,7 +7,7 @@
 #define SLEEP_TIMING_TIME(hours, minutes) hours * 60 + minutes
 
 #define SLEEP_TIME_SECONDS						1800 	///< Default sleep time
-#define SLEEP_TIMING_MIN_MOVING_VELOCITY				5		///< Speed under which to consider the tracker as not moving
+#define SLEEP_TIMING_MIN_MOVING_VELOCITY		5		///< Speed under which to consider the tracker as not moving
 #define SLEEP_PAUSING_TIME_SECONDS				270		///< Sleep time to use when not moving
 #define SLEEP_STOPPED_THRESHOLD					5		///< Number of successive positions acquired as not moving before considering the tracker as stopped
 
@@ -35,10 +35,10 @@ namespace config {
 	 */
 	static const sleepTimings_t defaultSleepTimings[] PROGMEM = {
 		// Sleep timings when not moving
-		{ 0, SLEEP_TIMING_TIME(16, 00), SLEEP_TIMING_TIME(19, 59), 3600 },				///< 1 hour between 16:00 and 20:00 UTC (04:00 to 08:00 UTC+12)
+		{ 0, SLEEP_TIMING_TIME(16, 00), SLEEP_TIMING_TIME(19, 59), 3600 },		///< 1 hour between 16:00 and 20:00 UTC (04:00 to 08:00 UTC+12)
 		{ 0, SLEEP_TIMING_TIME(20, 00), SLEEP_TIMING_MAX, SLEEP_TIME_SECONDS },	///< default (30 minutes) between 20:00 and 00:00 UTC (08:00 to 12:00 UTC+12)
 		{ 0, SLEEP_TIMING_MIN, SLEEP_TIMING_TIME(8, 29), SLEEP_TIME_SECONDS },	///< default (30 minutes) between 00:00 and 8:30 UTC (12:00 to 20:30 UTC+12)
-		{ 0, SLEEP_TIMING_TIME(8, 30), SLEEP_TIMING_TIME(15, 59), 10800 },				///< 3 hours between 20:30 and 16:00 UTC (20:30 to 04:00 UTC+12)
+		{ 0, SLEEP_TIMING_TIME(8, 30), SLEEP_TIMING_TIME(15, 59), 10800 },		///< 3 hours between 20:30 and 16:00 UTC (20:30 to 04:00 UTC+12)
 
 		// Sleep timings while moving
 		{ SLEEP_TIMING_MIN_MOVING_VELOCITY, SLEEP_TIMING_MIN, SLEEP_TIMING_MAX, 540 }, ///< 540 seconds when speed > SLEEP_TIMING_MIN_MOVING_VELOCITY (5km/h)