diff --git a/src/LightsManager.cpp b/src/LightsManager.cpp
index 223459ef90..7ef32830a1 100644
--- a/src/LightsManager.cpp
+++ b/src/LightsManager.cpp
@@ -71,16 +71,17 @@ static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
 	set<GameInput> vGIs;
 	vector<const Style*> vStyles;
 	GAMEMAN->GetStylesForGame( GAMESTATE->m_pCurGame, vStyles );
-	FOREACH( const Style*, vStyles, style )
+	auto const &value = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue();
+	for (Style const *style : vStyles)
 	{
-		bool bFound = find( CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue().begin(), CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue().end(), (*style)->m_StepsType ) != CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue().end();
+		bool bFound = find( value.begin(), value.end(), style->m_StepsType ) != value.end();
 		if( !bFound )
 			continue;
 		FOREACH_PlayerNumber( pn )
 		{
-			for( int iCol=0; iCol<(*style)->m_iColsPerPlayer; ++iCol )
+			for( int iCol=0; iCol < style->m_iColsPerPlayer; ++iCol )
 			{
-				GameInput gi = (*style)->StyleInputToGameInput( iCol, pn );
+				GameInput gi = style->StyleInputToGameInput( iCol, pn );
 				if( gi.IsValid() )
 				{
 					vGIs.insert( gi );
@@ -115,8 +116,10 @@ LightsManager::LightsManager()
 
 LightsManager::~LightsManager()
 {
-	FOREACH( LightsDriver*, m_vpDrivers, iter )
-		SAFE_DELETE( *iter );
+	for (LightsDriver *iter : m_vpDrivers)
+	{
+		SAFE_DELETE( iter );
+	}
 	m_vpDrivers.clear();
 }
 
@@ -421,8 +424,8 @@ void LightsManager::Update( float fDeltaTime )
 	}
 
 	// apply new light values we set above
-	FOREACH( LightsDriver*, m_vpDrivers, iter )
-		(*iter)->Set( &m_LightsState );
+	for (LightsDriver *iter : m_vpDrivers)
+		iter->Set( &m_LightsState );
 }
 
 void LightsManager::BlinkCabinetLight( CabinetLight cl )