diff --git a/src/char/char_mapif.c b/src/char/char_mapif.c
index 55dc14057b..5e56891af4 100644
--- a/src/char/char_mapif.c
+++ b/src/char/char_mapif.c
@@ -1402,8 +1402,8 @@ int chmapif_bonus_script_save(int fd) {
 				Sql_ShowDebug(sql_handle);
 
 			StringBuf_Destroy(&buf);
+			ShowInfo("Bonus Script saved for CID=%d. Total: %d.\n", cid, count);
 		}
-		ShowInfo("Bonus Script saved for CID=%d. Total: %d.\n", cid, count);
 		RFIFOSKIP(fd,RFIFOW(fd,2));
 	}
 	return 1;
diff --git a/src/common/cli.c b/src/common/cli.c
index 76049e7f3d..2c9318ad1b 100644
--- a/src/common/cli.c
+++ b/src/common/cli.c
@@ -71,7 +71,7 @@ void display_versionscreen(bool do_exit)
 	else {
 		const char* git = get_git_hash();
 		if( git[0] != UNKNOWN_VERSION )
-		ShowInfo("rAthena Git Hash: '"CL_WHITE"%s"CL_RESET"'\n", git);
+			ShowInfo("rAthena Git Hash: '"CL_WHITE"%s"CL_RESET"'\n", git);
 	}
 	ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://rathena.org/\n");
 	ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rizon.net/#rathena\n");
@@ -93,88 +93,107 @@ int cli_get_options(int argc, char ** argv) {
 	for (i = 1; i < argc; i++) {
 		const char* arg = argv[i];
 
-	if (arg[0] != '-' && (arg[0] != '/' || arg[1] == '-')) {// -, -- and /
-	    ShowError("Unknown option '%s'.\n", argv[i]);
-	    exit(EXIT_FAILURE);
-	} else if ((++arg)[0] == '-') {// long option
-	    arg++;
-
-	    if (strcmp(arg, "help") == 0) {
-		display_helpscreen(true);
-	    } else if (strcmp(arg, "version") == 0) {
-		display_versionscreen(true);
-	    } else if (strcmp(arg, "msg-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			MSG_CONF_NAME_EN = argv[++i];
-	    } else if (strcmp(arg, "run-once") == 0) // close the map-server as soon as its done.. for testing [Celest]
-	    {
-		runflag = CORE_ST_STOP;
-	    } else if (SERVER_TYPE & (ATHENA_SERVER_LOGIN | ATHENA_SERVER_CHAR)) { //login or char
-		if (strcmp(arg, "lan-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			LAN_CONF_NAME = argv[++i];
-		} else if (SERVER_TYPE == ATHENA_SERVER_LOGIN) { //login
-		    if (strcmp(arg, "login-config") == 0) {
-			if (opt_has_next_value(arg, i, argc))
-			    LOGIN_CONF_NAME = argv[++i];
-		    } else {
+		if (arg[0] != '-' && (arg[0] != '/' || arg[1] == '-')) {// -, -- and /
 			ShowError("Unknown option '%s'.\n", argv[i]);
 			exit(EXIT_FAILURE);
-		    }
-		} else if (SERVER_TYPE == ATHENA_SERVER_CHAR) { //char
-		    if (strcmp(arg, "char-config") == 0) {
-			if (opt_has_next_value(arg, i, argc))
-			    CHAR_CONF_NAME = argv[++i];
-		    } else if (strcmp(arg, "inter-config") == 0) {
-			if (opt_has_next_value(arg, i, argc))
-			    INTER_CONF_NAME = argv[++i];
-		    } else {
-			ShowError("Unknown option '%s'.\n", argv[i]);
-			exit(EXIT_FAILURE);
-		    }
 		}
-	    } else if (SERVER_TYPE == ATHENA_SERVER_MAP) { //map
-		if (strcmp(arg, "map-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			MAP_CONF_NAME = argv[++i];
-		} else if (strcmp(arg, "battle-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			BATTLE_CONF_FILENAME = argv[++i];
-		} else if (strcmp(arg, "atcommand-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			ATCOMMAND_CONF_FILENAME = argv[++i];
-		} else if (strcmp(arg, "script-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			SCRIPT_CONF_NAME = argv[++i];
-		} else if (strcmp(arg, "grf-path-file") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			GRF_PATH_FILENAME = argv[++i];
-		} else if (strcmp(arg, "inter-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			INTER_CONF_NAME = argv[++i];
-		} else if (strcmp(arg, "log-config") == 0) {
-		    if (opt_has_next_value(arg, i, argc))
-			LOG_CONF_NAME = argv[++i];
+		else if ((++arg)[0] == '-') {// long option
+			arg++;
+
+			if (strcmp(arg, "help") == 0) {
+				display_helpscreen(true);
+			}
+			else if (strcmp(arg, "version") == 0) {
+				display_versionscreen(true);
+			}
+			else if (strcmp(arg, "msg-config") == 0) {
+				if (opt_has_next_value(arg, i, argc))
+					MSG_CONF_NAME_EN = argv[++i];
+			}
+			else if (strcmp(arg, "run-once") == 0) { // close the map-server as soon as its done.. for testing [Celest]
+				runflag = CORE_ST_STOP;
+			}
+			else if (SERVER_TYPE & (ATHENA_SERVER_LOGIN | ATHENA_SERVER_CHAR)) { //login or char
+				if (strcmp(arg, "lan-config") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						LAN_CONF_NAME = argv[++i];
+				}
+				else if (SERVER_TYPE == ATHENA_SERVER_LOGIN) { //login
+					if (strcmp(arg, "login-config") == 0) {
+						if (opt_has_next_value(arg, i, argc))
+							LOGIN_CONF_NAME = argv[++i];
+					}
+					else {
+						ShowError("Unknown option '%s'.\n", argv[i]);
+						exit(EXIT_FAILURE);
+					}
+				}
+				else if (SERVER_TYPE == ATHENA_SERVER_CHAR) { //char
+					if (strcmp(arg, "char-config") == 0) {
+						if (opt_has_next_value(arg, i, argc))
+							CHAR_CONF_NAME = argv[++i];
+					}
+					else if (strcmp(arg, "inter-config") == 0) {
+						if (opt_has_next_value(arg, i, argc))
+							INTER_CONF_NAME = argv[++i];
+					}
+					else {
+						ShowError("Unknown option '%s'.\n", argv[i]);
+						exit(EXIT_FAILURE);
+					}
+				}
+			}
+			else if (SERVER_TYPE == ATHENA_SERVER_MAP) { //map
+				if (strcmp(arg, "map-config") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						MAP_CONF_NAME = argv[++i];
+				}
+				else if (strcmp(arg, "battle-config") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						BATTLE_CONF_FILENAME = argv[++i];
+				}
+				else if (strcmp(arg, "atcommand-config") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						ATCOMMAND_CONF_FILENAME = argv[++i];
+				}
+				else if (strcmp(arg, "script-config") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						SCRIPT_CONF_NAME = argv[++i];
+				}
+				else if (strcmp(arg, "grf-path-file") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						GRF_PATH_FILENAME = argv[++i];
+				}
+				else if (strcmp(arg, "inter-config") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						INTER_CONF_NAME = argv[++i];
+				}
+				else if (strcmp(arg, "log-config") == 0) {
+					if (opt_has_next_value(arg, i, argc))
+						LOG_CONF_NAME = argv[++i];
+				}
+				else {
+					ShowError("Unknown option '%s'.\n", argv[i]);
+					exit(EXIT_FAILURE);
+				}
+			}
 		}
 		else {
-		    ShowError("Unknown option '%s'.\n", argv[i]);
-		    exit(EXIT_FAILURE);
+			switch (arg[0]) {// short option
+				case '?':
+				case 'h':
+					display_helpscreen(true);
+					break;
+				case 'v':
+					display_versionscreen(true);
+					break;
+				default:
+					ShowError("Unknown option '%s'.\n", argv[i]);
+					exit(EXIT_FAILURE);
+				}
 		}
-	    }
-	} else switch (arg[0]) {// short option
-	    case '?':
-	    case 'h':
-		display_helpscreen(true);
-		break;
-	    case 'v':
-		display_versionscreen(true);
-		break;
-	    default:
-		ShowError("Unknown option '%s'.\n", argv[i]);
-		exit(EXIT_FAILURE);
-	    }
-    }
-    return 1;
+	}
+	return 1;
 }
 
 /**