diff --git a/maps/mp/bots/_bot_chat.gsc b/maps/mp/bots/_bot_chat.gsc
index 13f6abc..6f3c125 100644
--- a/maps/mp/bots/_bot_chat.gsc
+++ b/maps/mp/bots/_bot_chat.gsc
@@ -48,8 +48,7 @@ BotDoChat( chance, string, isTeam )
 		return;
 	}
 
-	if ( chance >= 100 || mod >= 100.0 ||
-	    ( randomint( 100 ) < ( chance * mod ) + 0 ) )
+	if ( chance >= 100 || mod >= 100.0 || ( randomint( 100 ) < ( chance * mod ) + 0 ) )
 	{
 		if ( isdefined( isTeam ) && isTeam )
 		{
diff --git a/maps/mp/bots/_bot_script.gsc b/maps/mp/bots/_bot_script.gsc
index 0796b99..3ae3daa 100644
--- a/maps/mp/bots/_bot_script.gsc
+++ b/maps/mp/bots/_bot_script.gsc
@@ -765,13 +765,6 @@ get_random_attachment( weapon, rank )
 
 		if ( reasonable )
 		{
-			/*  switch(att)
-						    {
-							case "acog":
-								if(weapon != "m40a3")
-									continue;
-								break;
-						    }*/
 		}
 
 		return att;
@@ -5602,9 +5595,7 @@ bot_war_loop( data )
 	}
 
 	// check if should cap
-	if ( game[ "war_momentum" ][ myTeam + "_multiplier" ] == getdvarint( "twar_momentumMaxMultiplier" ) ||
-	    flag.useobj.numtouching[ otherTeam ] > flag.useobj.numtouching[ myTeam ] ||
-	    data.rand > 90 || ourFlags < theirFlags )
+	if ( game[ "war_momentum" ][ myTeam + "_multiplier" ] == getdvarint( "twar_momentumMaxMultiplier" ) || flag.useobj.numtouching[ otherTeam ] > flag.useobj.numtouching[ myTeam ] || data.rand > 90 || ourFlags < theirFlags )
 	{
 		self BotNotifyBotEvent( "twar", "go", "cap" );
 
diff --git a/maps/mp/bots/_bot_utility.gsc b/maps/mp/bots/_bot_utility.gsc
index 9886606..5b7e222 100644
--- a/maps/mp/bots/_bot_utility.gsc
+++ b/maps/mp/bots/_bot_utility.gsc
@@ -770,11 +770,7 @@ allowTeamChoice()
 */
 waittill_any_timeout( timeOut, string1, string2, string3, string4, string5 )
 {
-	if ( ( !isdefined( string1 ) || string1 != "death" ) &&
-	    ( !isdefined( string2 ) || string2 != "death" ) &&
-	    ( !isdefined( string3 ) || string3 != "death" ) &&
-	    ( !isdefined( string4 ) || string4 != "death" ) &&
-	    ( !isdefined( string5 ) || string5 != "death" ) )
+	if ( ( !isdefined( string1 ) || string1 != "death" ) && ( !isdefined( string2 ) || string2 != "death" ) && ( !isdefined( string3 ) || string3 != "death" ) && ( !isdefined( string4 ) || string4 != "death" ) && ( !isdefined( string5 ) || string5 != "death" ) )
 	{
 		self endon( "death" );
 	}