diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp
index 88ecab74bc..11d0f2766d 100644
--- a/stepmania/src/ScoreKeeperNormal.cpp
+++ b/stepmania/src/ScoreKeeperNormal.cpp
@@ -18,10 +18,8 @@
 #include "song.h"
 #include "NoteDataWithScoring.h"
 
-ScoreKeeperNormal::ScoreKeeperNormal( 
-		PlayerState* pPlayerState,
-		PlayerStageStats* pPlayerStageStats ):
-	ScoreKeeper(pPlayerState,pPlayerStageStats)
+ScoreKeeperNormal::ScoreKeeperNormal( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats ):
+	ScoreKeeper(pPlayerState, pPlayerStageStats)
 {
 }
 
diff --git a/stepmania/src/ScoreKeeperNormal.h b/stepmania/src/ScoreKeeperNormal.h
index 37060c1bc4..20b330cc83 100644
--- a/stepmania/src/ScoreKeeperNormal.h
+++ b/stepmania/src/ScoreKeeperNormal.h
@@ -1,7 +1,7 @@
 /* ScoreKeeperNormal -  */
 
-#ifndef ScoreKeeperNormal_H
-#define ScoreKeeperNormal_H
+#ifndef SCORE_KEEPER_NORMAL_H
+#define SCORE_KEEPER_NORMAL_H
 
 #include "ScoreKeeper.h"
 #include "Attack.h"
@@ -40,10 +40,7 @@ class ScoreKeeperNormal: public ScoreKeeper
 	int		m_ComboBonusFactor[NUM_TapNoteScore];
 
 public:
-	ScoreKeeperNormal( 
-		PlayerState* pPlayerState,
-		PlayerStageStats* pPlayerStageStats );
-	virtual ~ScoreKeeperNormal() { }
+	ScoreKeeperNormal( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats );
 
 	void Load(
 		const vector<Song*>& apSongs,