diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 0b7b51d0cb..814093883a 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -1131,13 +1131,12 @@ void ScreenGameplay::LoadNextSong()
 	m_LyricDisplay.PlayCommand( bAllReverse? "SetReverse": bAtLeastOneReverse? "SetOneReverse": "SetNoReverse" );
 
 	// Load lyrics
-	// XXX: don't load this here
+	// XXX: don't load this here (who and why? -aj)
 	LyricsLoader LL;
 	if( GAMESTATE->m_pCurSong->HasLyrics()  )
 		LL.LoadFromLRCFile(GAMESTATE->m_pCurSong->GetLyricsPath(), *GAMESTATE->m_pCurSong);
 
-
-	/* Set up song-specific graphics. */
+	// Set up song-specific graphics.
 
 	// Check to see if any players are in beginner mode.
 	// Note: steps can be different if turn modifiers are used.
@@ -1157,21 +1156,22 @@ void ScreenGameplay::LoadNextSong()
 	if( m_pSongForeground )
 		m_pSongForeground->Unload();
 
-	if( !PREFSMAN->m_bShowBeginnerHelper || !m_BeginnerHelper.Initialize(2) )
+	if( !PREFSMAN->m_bShowBeginnerHelper || !m_BeginnerHelper.Init(2) )
 	{
 		m_BeginnerHelper.SetVisible( false );
 
-		/* BeginnerHelper disabled, or failed to load. */
+		// BeginnerHelper disabled, or failed to load.
 		if( m_pSongBackground )
 			m_pSongBackground->LoadFromSong( GAMESTATE->m_pCurSong );
 
 		if( !GAMESTATE->m_bDemonstrationOrJukebox )
 		{
-			/* This will fade from a preset brightness to the actual brightness (based
-			 * on prefs and "cover").  The preset brightness may be 0 (to fade from
-			 * black), or it might be 1, if the stage screen has the song BG and we're
-			 * coming from it (like Pump).  This used to be done in SM_PlayReady, but
-			 * that means it's impossible to snap to the new brightness immediately. */
+			/* This will fade from a preset brightness to the actual brightness
+			 * (based on prefs and "cover"). The preset brightness may be 0 (to
+			 * fade from black), or it might be 1, if the stage screen has the
+			 * song BG and we're coming from it (like Pump). This used to be done
+			 * in SM_PlayReady, but that means it's impossible to snap to the
+			 * new brightness immediately. */
 			if( m_pSongBackground )
 			{
 				m_pSongBackground->SetBrightness( INITIAL_BACKGROUND_BRIGHTNESS );