diff --git a/headers/configManagement.h b/headers/configManagement.h
index e18d025..180a908 100644
--- a/headers/configManagement.h
+++ b/headers/configManagement.h
@@ -14,10 +14,8 @@
 
 #include<climits>
 
-/*
- * This header will only be imported once, but Djalim told me he would hurt me
- * if I didn't move it into his own header file instead of the cpp file
-*/
+/* This header will only be imported once, but Djalim told me he would hurt me
+ * if I didn't move it into his own header file instead of the cpp file*/
 
 class ConfigBuilder{
 public:
diff --git a/src/configManagement.cpp b/src/configManagement.cpp
index 142a7d9..405a702 100644
--- a/src/configManagement.cpp
+++ b/src/configManagement.cpp
@@ -30,10 +30,8 @@ void sanitizeValue(string& val) {
 	}
 }
 
-/*
- * WARNING : This implementation of YAML is not meant to be complete, but to work with our specific needs
- * It also can't detect and report errors in a non-YAML-compliant file
- */
+/* WARNING : This implementation of YAML is not meant to be complete, but to work with our specific needs
+ * It also can't detect and report errors in a non-YAML-compliant file*/
 
 void ConfigBuilder::parseFile(const string& fname) {
 	ifstream file(fname);
diff --git a/src/game/gameManagers.cpp b/src/game/gameManagers.cpp
index 0b6d346..a9de703 100644
--- a/src/game/gameManagers.cpp
+++ b/src/game/gameManagers.cpp
@@ -113,8 +113,7 @@ void Game::remCollidingProjectiles(){
 			++tor;
 		}
 		/* if it was colling, it was removed and his Position is now replaced by the next.
-		 * else, go to the next
-		 */
+		 * else, go to the next */
 		if(!wasColliding)++miss;
 	}
 }
diff --git a/src/game/godManager.cpp b/src/game/godManager.cpp
index 735576a..a4dd6c4 100644
--- a/src/game/godManager.cpp
+++ b/src/game/godManager.cpp
@@ -19,10 +19,8 @@ void Game::awakeGod() {
  * @returns true if we can finish the game
  */
 
-/*
- * This is a really long function, but I feel like it's still readable because of the switch, and...
- * Honestly I think splitting it into multiple small functions would be ugly
-*/
+/* This is a really long function, but I feel like it's still readable because of the switch, and...
+ * Honestly I think splitting it into multiple small functions would be ugly*/
 bool Game::manageGod() {
 	switch (god.state) {
 		case GodState::NONE: {
@@ -86,10 +84,8 @@ bool Game::manageGod() {
 			playerID target;
 			if (players.size() == 1)target = PLAYER1; // don't want to use random if not needed
 			else target = rand() % players.size();
-			/*
-			 * Let's just pretend god is drunk and can fire at a player that have a death animation, because
-			 * honestly at this point I want to re-code the whole game engine to allow a better handling of cases like this...
-			 */
+			/* Let's just pretend god is drunk and can fire at a player that have a death animation, because
+			 * honestly at this point I want to re-code the whole game engine to allow a better handling of cases like this...*/
 
 			Position playerMiddlePos(players[target].x + confData.playersWidth / 2,
 									 pm.getScreenHeight() - PLAYER_HEIGHT / 2);
diff --git a/src/scoresManager.cpp b/src/scoresManager.cpp
index ac9328f..d77e947 100644
--- a/src/scoresManager.cpp
+++ b/src/scoresManager.cpp
@@ -41,8 +41,7 @@ void ScoresManager::readFile() {
 
 	/* the first line is the hash sum of (the following content + a secret key)
 	 * We use it to generate a data signature to prevent users
-	 * from tampering with the save file
-	 */
+	 * from tampering with the save file*/
 	size_t hash;
 	ifs >> hash;
 	ifs.get(); // remove \n