diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp
index 5acf484d4e..98ce045520 100644
--- a/src/BPMDisplay.cpp
+++ b/src/BPMDisplay.cpp
@@ -94,7 +94,6 @@ void BPMDisplay::Update( float fDeltaTime )
 	}
 }
 
-
 void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
 {
 	ASSERT( !bpms.vfBpms.empty() );
diff --git a/src/BPMDisplay.h b/src/BPMDisplay.h
index 566993a681..23614985ab 100644
--- a/src/BPMDisplay.h
+++ b/src/BPMDisplay.h
@@ -1,5 +1,3 @@
-/** @brief BPMDisplay - displays a BPM or a range of BPMs. */
-
 #ifndef BPM_DISPLAY_H
 #define BPM_DISPLAY_H
 
@@ -11,7 +9,7 @@ class Song;
 class Course;
 struct DisplayBpms;
 
-/** @brief Display the BPM/range of them as requested. */
+/** @brief Displays a BPM or a range of BPMs. */
 class BPMDisplay : public BitmapText
 {
 public:
diff --git a/src/Character.h b/src/Character.h
index 6620439cbf..be69369bfa 100644
--- a/src/Character.h
+++ b/src/Character.h
@@ -1,5 +1,3 @@
-/* Character - An persona that defines attacks for use in battle. */
-
 #ifndef Character_H
 #define Character_H
 
@@ -9,14 +7,14 @@
 struct lua_State;
 typedef lua_State Lua;
 
-
+/** @brief A persona that defines attacks for use in battle. */
 class Character
 {
 public:
 	Character();
 	~Character() { }
 
-	bool Load( RString sCharDir );	// return true if success
+	bool Load( RString sCharDir ); // return true if successful
 
 	RString GetTakingABreakPath() const;
 	RString GetCardPath() const { return m_sCardPath; }
diff --git a/src/OptionRowHandler.cpp b/src/OptionRowHandler.cpp
index e3206c0f0f..2962f963c3 100644
--- a/src/OptionRowHandler.cpp
+++ b/src/OptionRowHandler.cpp
@@ -1364,7 +1364,7 @@ OptionRowHandler* OptionRowHandlerUtil::MakeSimple( const MenuRowDef &mr )
 
 	pHand->m_Def.m_sName = mr.sName;
 	FontCharAliases::ReplaceMarkers( pHand->m_Def.m_sName );	// Allow special characters
-	
+
 	pHand->m_Def.m_vEnabledForPlayers.clear();
 	if( mr.pfnEnabled? mr.pfnEnabled():mr.bEnabled )
 	{
diff --git a/src/ScreenOptionsExportPackage.cpp b/src/ScreenOptionsExportPackage.cpp
index c6858a2571..acf8f6e153 100644
--- a/src/ScreenOptionsExportPackage.cpp
+++ b/src/ScreenOptionsExportPackage.cpp
@@ -156,7 +156,7 @@ void ScreenOptionsExportPackage::ProcessMenuStart( const InputEventPlus &input )
 
 	RString sDirToExport = m_vsPossibleDirsToExport[ iCurRow ];
 	RString sPackageName = ReplaceInvalidFileNameChars( sDirToExport + ".smzip" );
-	
+
 	RString sError;
 	if( ExportPackage(sPackageName, sDirToExport, sError) )
 		ScreenPrompt::Prompt( SM_None, ssprintf("Exported '%s' to the desktop", sDirToExport.c_str()) );
@@ -174,7 +174,6 @@ void ScreenOptionsExportPackage::ExportOptions( int iRow, const vector<PlayerNum
 
 }
 
-
 /*
  * (c) 2002-2004 Chris Danford
  * All rights reserved.
diff --git a/src/ScreenOptionsExportPackage.h b/src/ScreenOptionsExportPackage.h
index d743a7f419..c4fae13933 100644
--- a/src/ScreenOptionsExportPackage.h
+++ b/src/ScreenOptionsExportPackage.h
@@ -6,6 +6,7 @@
 
 class Course;
 
+/** @brief A menu for exporting packages. */
 class ScreenOptionsExportPackage : public ScreenOptions
 {
 public:
@@ -15,7 +16,7 @@ public:
 protected:
 	virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
 	virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
-	
+
 	virtual void ProcessMenuStart( const InputEventPlus &input );
 
 	vector<RString> m_vsPossibleDirsToExport;
diff --git a/src/ScreenTextEntry.h b/src/ScreenTextEntry.h
index e5e4745389..5b16fff664 100644
--- a/src/ScreenTextEntry.h
+++ b/src/ScreenTextEntry.h
@@ -133,6 +133,7 @@ private:
 	RageTimer	m_timerToggleCursor;
 };
 
+/** @brief Displays a text entry box and keyboard over the top of another screen. */
 class ScreenTextEntryVisual: public ScreenTextEntry
 {
 public: