diff --git a/inc/Helpers/TimeAndDate.hpp b/inc/Helpers/TimeAndDate.hpp
index bd35d52315592939a19f61e9beb2d5dfc427a2fd..b40913dfa323227af22d338252d0398c9778ded4 100644
--- a/inc/Helpers/TimeAndDate.hpp
+++ b/inc/Helpers/TimeAndDate.hpp
@@ -6,7 +6,7 @@
 /**
  * A class that represents the time and date.
  *
- * @notes
+ * @note
  * This struct is similar to the `struct tm` of <ctime> library but it is more embedded-friendly
  */
 class TimeAndDate {
diff --git a/inc/Helpers/TimeHelper.hpp b/inc/Helpers/TimeHelper.hpp
index b9d11c9b338858f92cfcefa37ad7b17b52f70bdb..18ba87e7777dba9246e5fa8e109998e52b38982d 100644
--- a/inc/Helpers/TimeHelper.hpp
+++ b/inc/Helpers/TimeHelper.hpp
@@ -60,7 +60,7 @@ private:
      * @todo check if we need to change the epoch to ,the recommended from the standard, 1 January
      * 1958
      */
-	 TimeAndDate utcTime(uint32_t seconds);
+	TimeAndDate utcTime(uint32_t seconds);
 
 public:
 
diff --git a/src/Helpers/TimeAndDate.cpp b/src/Helpers/TimeAndDate.cpp
index 0c5a1899fc5b1b528f2f70c0a7ab47caac4994d4..171f7a561a0136438416c8b873b9156ddad746c0 100644
--- a/src/Helpers/TimeAndDate.cpp
+++ b/src/Helpers/TimeAndDate.cpp
@@ -1,9 +1,6 @@
 #include "Helpers/TimeHelper.hpp"
 
 bool TimeAndDate::operator<(const TimeAndDate &Date) {
-	//@note clang tidy complaints when using else after return so that's why there are these
-	// numerous if checks. Sorry for the ugly code...
-
 	// compare years
 	if (this->year < Date.year) {
 		return true;
@@ -50,13 +47,9 @@ bool TimeAndDate::operator<(const TimeAndDate &Date) {
 	}
 
 	return false;
-
 }
 
 bool TimeAndDate::operator>(const TimeAndDate &Date) {
-	//@note clang tidy complaints when using else after return so that's why there are these
-	// numerous if checks. Sorry for the ugly code...
-
 	// compare years
 	if (this->year > Date.year) {
 		return true;
@@ -103,13 +96,9 @@ bool TimeAndDate::operator>(const TimeAndDate &Date) {
 	}
 
 	return false;
-
 }
 
 bool TimeAndDate::operator<=(const TimeAndDate &Date) {
-	//@note clang tidy complaints when using else after return so that's why there are these
-	// numerous if checks. Sorry for the ugly code...
-
 	// compare years
 	if (this->year < Date.year) {
 		return true;
@@ -159,13 +148,9 @@ bool TimeAndDate::operator<=(const TimeAndDate &Date) {
 	}
 
 	return true;
-
 }
 
 bool TimeAndDate::operator>=(const TimeAndDate &Date) {
-	//@note clang tidy complaints when using else after return so that's why there are these
-	// numerous if checks. Sorry for the ugly code...
-
 	// compare years
 	if (this->year > Date.year) {
 		return true;
@@ -215,7 +200,6 @@ bool TimeAndDate::operator>=(const TimeAndDate &Date) {
 	}
 
 	return true;
-
 }
 
 bool TimeAndDate::operator==(const TimeAndDate &Date) {
@@ -250,5 +234,4 @@ bool TimeAndDate::operator==(const TimeAndDate &Date) {
 	}
 
 	return true;
-
 }