diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java
index d44b78de..5daaf054 100644
--- a/src/itdelatrisu/opsu/GameData.java
+++ b/src/itdelatrisu/opsu/GameData.java
@@ -241,7 +241,7 @@ public class GameData {
 	/**
 	 * Constructor for score viewing.
 	 * This will initialize all parameters and images needed for the
-	 * {@link #drawRankingElements(Graphics, int, int)} method.
+	 * {@link #drawRankingElements(Graphics, OsuFile)} method.
 	 * @param s the ScoreData object
 	 * @param width container width
 	 * @param height container height
diff --git a/src/itdelatrisu/opsu/ScoreDB.java b/src/itdelatrisu/opsu/ScoreDB.java
index 0adc3bf1..59883ceb 100644
--- a/src/itdelatrisu/opsu/ScoreDB.java
+++ b/src/itdelatrisu/opsu/ScoreDB.java
@@ -114,25 +114,25 @@ public class ScoreDB {
 	 * Adds the game score to the database.
 	 * @param data the GameData object
 	 */
-	public static void addScore(ScoreData score) {
+	public static void addScore(ScoreData data) {
 		try {
-			insertStmt.setLong(1, score.timestamp);
-			insertStmt.setInt(2, score.MID);
-			insertStmt.setInt(3, score.MSID);
-			insertStmt.setString(4, score.title);
-			insertStmt.setString(5, score.artist);
-			insertStmt.setString(6, score.creator);
-			insertStmt.setString(7, score.version);
-			insertStmt.setInt(8, score.hit300);
-			insertStmt.setInt(9, score.hit100);
-			insertStmt.setInt(10, score.hit50);
-			insertStmt.setInt(11, score.geki);
-			insertStmt.setInt(12, score.katu);
-			insertStmt.setInt(13, score.miss);
-			insertStmt.setLong(14, score.score);
-			insertStmt.setInt(15, score.combo);
-			insertStmt.setBoolean(16, score.perfect);
-			insertStmt.setInt(17, score.mods);
+			insertStmt.setLong(1, data.timestamp);
+			insertStmt.setInt(2, data.MID);
+			insertStmt.setInt(3, data.MSID);
+			insertStmt.setString(4, data.title);
+			insertStmt.setString(5, data.artist);
+			insertStmt.setString(6, data.creator);
+			insertStmt.setString(7, data.version);
+			insertStmt.setInt(8, data.hit300);
+			insertStmt.setInt(9, data.hit100);
+			insertStmt.setInt(10, data.hit50);
+			insertStmt.setInt(11, data.geki);
+			insertStmt.setInt(12, data.katu);
+			insertStmt.setInt(13, data.miss);
+			insertStmt.setLong(14, data.score);
+			insertStmt.setInt(15, data.combo);
+			insertStmt.setBoolean(16, data.perfect);
+			insertStmt.setInt(17, data.mods);
 			insertStmt.executeUpdate();
 		} catch (SQLException e) {
 			ErrorHandler.error("Failed to save score to database.", e, true);
diff --git a/src/itdelatrisu/opsu/SongSort.java b/src/itdelatrisu/opsu/SongSort.java
index c4bc93e3..f2a8016f 100644
--- a/src/itdelatrisu/opsu/SongSort.java
+++ b/src/itdelatrisu/opsu/SongSort.java
@@ -145,7 +145,6 @@ public enum SongSort {
 
 	/**
 	 * Initializes the sort tab.
-	 * @param img the tab image
 	 * @param width the container width
 	 * @param height the container height
 	 */
diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java
index e373105f..9fd355d6 100644
--- a/src/itdelatrisu/opsu/objects/Slider.java
+++ b/src/itdelatrisu/opsu/objects/Slider.java
@@ -348,8 +348,6 @@ public class Slider implements HitObject {
 
 	/**
 	 * Calculates the slider hit result.
-	 * @param time the hit object time (difference between track time)
-	 * @param lastCircleHit true if the cursor was held within the last circle
 	 * @return the hit result (GameData.HIT_* constants)
 	 */
 	private int hitResult() {
diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java
index d4cb3b99..2e6f372b 100644
--- a/src/itdelatrisu/opsu/states/SongMenu.java
+++ b/src/itdelatrisu/opsu/states/SongMenu.java
@@ -963,7 +963,6 @@ public class SongMenu extends BasicGameState {
 
 	/**
 	 * Starts the game.
-	 * @param osu the OsuFile to send to the game
 	 */
 	private void startGame() {
 		if (MusicController.isTrackLoading())