diff --git a/inc/MessageParser.hpp b/inc/MessageParser.hpp
index 0db0f8c638fa4e82d10664618cf88f7871b54e36..b064ae2dffae96bf4c6119bd0727f8367ccdbafc 100644
--- a/inc/MessageParser.hpp
+++ b/inc/MessageParser.hpp
@@ -67,7 +67,7 @@ private:
 	 * @param length The size of the header
 	 * @param message The Message to modify based on the header
 	 */
-	void parseTC(uint8_t *data, uint16_t length, Message &message);
+	void parseTC(const uint8_t *data, uint16_t length, Message &message);
 
 	/**
 	 * Parse the ECSS Telemetry packet secondary header
@@ -78,7 +78,7 @@ private:
 	 * @param length The size of the header
 	 * @param message The Message to modify based on the header
 	 */
-	void parseTM(uint8_t *data, uint16_t length, Message &message);
+	void parseTM(const uint8_t *data, uint16_t length, Message &message);
 };
 
 
diff --git a/inc/Services/TimeBasedSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp
index f869b716cf4b5b451c420f5f46025bdd594e814e..6a510a0271bf3923003540eb347eea433746fbac 100644
--- a/inc/Services/TimeBasedSchedulingService.hpp
+++ b/inc/Services/TimeBasedSchedulingService.hpp
@@ -53,7 +53,9 @@ private:
 		// todo: If we decide to use sub-schedules, the ID of that has to be defined
 		// todo: If groups are used, then the group ID has to be defined here
 	};
-	etl::vector<ScheduledActivity, MAX_NUMBER_OF_ACTIVITIES> scheduledActivities; // Scheduled activity definitions
+
+	// Scheduled activity definitions
+	etl::vector<ScheduledActivity, MAX_NUMBER_OF_ACTIVITIES> scheduledActivities;
 
 	// Enable tester access to private members
 	friend struct ::unit_test::Tester;
diff --git a/src/MessageParser.cpp b/src/MessageParser.cpp
index 7c66e17fcc947c217883a8f55fc3858d3344966a..0feab496551ac0aeab0811138a9beab96aed0bf3 100644
--- a/src/MessageParser.cpp
+++ b/src/MessageParser.cpp
@@ -53,7 +53,7 @@ Message MessageParser::parse(uint8_t *data, uint32_t length) {
 	return message;
 }
 
-void MessageParser::parseTC(uint8_t *data, uint16_t length, Message &message) {
+void MessageParser::parseTC(const uint8_t *data, uint16_t length, Message &message) {
 	ErrorHandler::assertRequest(length >= 5, message, ErrorHandler::UnacceptableMessage);
 
 	// Individual fields of the TC header
@@ -98,7 +98,7 @@ String<ECSS_EVENT_SERVICE_STRING_SIZE> MessageParser::convertTCToStr(Message &me
 	5);
 }
 
-void MessageParser::parseTM(uint8_t *data, uint16_t length, Message &message) {
+void MessageParser::parseTM(const uint8_t *data, uint16_t length, Message &message) {
 	ErrorHandler::assertRequest(length >= 5, message, ErrorHandler::UnacceptableMessage);
 
 	// Individual fields of the TM header
diff --git a/test/Services/TimeBasedSchedulingService.cpp b/test/Services/TimeBasedSchedulingService.cpp
index c37c1dff1886f9d8252a25dccc4378b1a71b3b32..6abe19f2d5aff52f6ddc5f499ef6039d32b942cc 100644
--- a/test/Services/TimeBasedSchedulingService.cpp
+++ b/test/Services/TimeBasedSchedulingService.cpp
@@ -37,7 +37,7 @@ TEST_CASE("TC[11,2]", "[service][st11]") {
 
 	TimeBasedSchedulingService timeSchedulingService;
 	timeSchedulingService.disableScheduleExecution(receivedMessage);
-	CHECK(!unit_test::Tester::executionFunctionStatus(timeSchedulingService));
+	CHECK(not unit_test::Tester::executionFunctionStatus(timeSchedulingService));
 	auto sch = unit_test::Tester::scheduledActivities(timeSchedulingService);
 }