diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java
index 28432626..0b79409b 100644
--- a/src/itdelatrisu/opsu/GameData.java
+++ b/src/itdelatrisu/opsu/GameData.java
@@ -534,6 +534,7 @@ public class GameData {
 	public void drawGameElements(Graphics g, boolean breakPeriod, boolean firstObject) {
 		boolean relaxAutoPilot = (GameMod.RELAX.isActive() || GameMod.AUTOPILOT.isActive());
 		int margin = (int) (width * 0.008f);
+		float uiScale = GameImage.getUIscale();
 
 		// score
 		if (!relaxAutoPilot)
@@ -602,46 +603,43 @@ public class GameData {
 				hitErrorAlpha = (HIT_ERROR_FADE_TIME - (trackPosition - hitErrorList.getFirst().time)) / (HIT_ERROR_FADE_TIME * 0.1f);
 
 			// draw bar
-			float hitErrorY = height/GameImage.getUIscale() - margin - 10, hitErrorX = width/GameImage.getUIscale() / 2;
+			float hitErrorX = width / uiScale / 2;
+			float hitErrorY = height / uiScale - margin - 10;
+			float barY = (hitErrorY - 3) * uiScale, barHeight = 6 * uiScale;
+			float tickY = (hitErrorY - 10) * uiScale, tickHeight = 20 * uiScale;
 			float oldAlphaBlack = Utils.COLOR_BLACK_ALPHA.a;
 			Utils.COLOR_BLACK_ALPHA.a = hitErrorAlpha;
 			g.setColor(Utils.COLOR_BLACK_ALPHA);
-			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50] ) * GameImage.getUIscale(),
-					(hitErrorY - 10 ) * GameImage.getUIscale(), 
-					(hitResultOffset[HIT_50] * 2 ) * GameImage.getUIscale(), 20  * GameImage.getUIscale());
+			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50]) * uiScale, tickY,
+					(hitResultOffset[HIT_50] * 2) * uiScale, tickHeight);
 			Utils.COLOR_BLACK_ALPHA.a = oldAlphaBlack;
 			Utils.COLOR_LIGHT_ORANGE.a = hitErrorAlpha;
 			g.setColor(Utils.COLOR_LIGHT_ORANGE);
-			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50]) * GameImage.getUIscale(),
-					(hitErrorY - 3) * GameImage.getUIscale(), 
-					(hitResultOffset[HIT_50] * 2) * GameImage.getUIscale(), 6 * GameImage.getUIscale());
+			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50]) * uiScale, barY,
+					(hitResultOffset[HIT_50] * 2) * uiScale, barHeight);
 			Utils.COLOR_LIGHT_ORANGE.a = 1f;
 			Utils.COLOR_LIGHT_GREEN.a = hitErrorAlpha;
 			g.setColor(Utils.COLOR_LIGHT_GREEN);
-			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_100]) * GameImage.getUIscale(),
-					(hitErrorY - 3) * GameImage.getUIscale(), 
-					(hitResultOffset[HIT_100] * 2) * GameImage.getUIscale(), 6 * GameImage.getUIscale());
+			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_100]) * uiScale, barY,
+					(hitResultOffset[HIT_100] * 2) * uiScale, barHeight);
 			Utils.COLOR_LIGHT_GREEN.a = 1f;
 			Utils.COLOR_LIGHT_BLUE.a = hitErrorAlpha;
 			g.setColor(Utils.COLOR_LIGHT_BLUE);
-			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_300]) * GameImage.getUIscale(),
-					(hitErrorY - 3) * GameImage.getUIscale(),
-					(hitResultOffset[HIT_300] * 2) * GameImage.getUIscale(), 6 * GameImage.getUIscale());
+			g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_300]) * uiScale, barY,
+					(hitResultOffset[HIT_300] * 2) * uiScale, barHeight);
 			Utils.COLOR_LIGHT_BLUE.a = 1f;
 			white.a = hitErrorAlpha;
 			g.setColor(white);
-			g.fillRect((hitErrorX - 1.5f) * GameImage.getUIscale(), (hitErrorY - 10) * GameImage.getUIscale(),
-			3 * GameImage.getUIscale(), 20 * GameImage.getUIscale());
+			g.fillRect((hitErrorX - 1.5f) * uiScale, tickY, 3 * uiScale, tickHeight);
 
 			// draw ticks
+			float tickWidth = 2 * uiScale;
 			for (HitErrorInfo info : hitErrorList) {
 				int time = info.time;
 				float alpha = 1 - ((float) (trackPosition - time) / HIT_ERROR_FADE_TIME);
 				white.a = alpha * hitErrorAlpha;
 				g.setColor(white);
-				g.fillRect((hitErrorX + info.timeDiff - 1) * GameImage.getUIscale(),
-						(hitErrorY - 10) * GameImage.getUIscale(),
-						2 * GameImage.getUIscale(), 20 * GameImage.getUIscale());
+				g.fillRect((hitErrorX + info.timeDiff - 1) * uiScale, tickY, tickWidth, tickHeight);
 			}
 		}
 
@@ -659,8 +657,8 @@ public class GameData {
 				colour = scorebarColour.getCurrentFrame();
 			} else
 				colour = GameImage.SCOREBAR_COLOUR.getImage();
-			float colourX = 4 * GameImage.getUIscale(), colourY = 15 * GameImage.getUIscale();
-			Image colourCropped = colour.getSubImage(0, 0, (int) (645 * GameImage.getUIscale() * healthRatio), colour.getHeight());
+			float colourX = 4 * uiScale, colourY = 15 * uiScale;
+			Image colourCropped = colour.getSubImage(0, 0, (int) (645 * uiScale * healthRatio), colour.getHeight());
 
 			scorebar.setAlpha(1f);
 			scorebar.draw(0, 0);
@@ -716,17 +714,17 @@ public class GameData {
 		float scoreTextScale = 1.0f;
 		float symbolTextScale = 1.15f;
 		float rankResultScale = 0.5f;
+		float uiScale = GameImage.getUIscale();
 
 		// ranking panel
-		GameImage.RANKING_PANEL.getImage().draw(0, (int) (rankingHeight * GameImage.getUIscale()));
+		GameImage.RANKING_PANEL.getImage().draw(0, (int) (rankingHeight * uiScale));
 
 		// score
 		drawFixedSizeSymbolString(
 				(score < 100000000) ? String.format("%08d", score) : Long.toString(score),
-				(int) (210 * GameImage.getUIscale()),
-				(int) ((rankingHeight + 50) * GameImage.getUIscale()),
-				scoreTextScale,
-				getScoreSymbolImage('0').getWidth() * scoreTextScale - 2, false);
+				210 * uiScale, (rankingHeight + 50) * uiScale,
+				scoreTextScale, getScoreSymbolImage('0').getWidth() * scoreTextScale - 2, false
+		);
 
 		// result counts
 		float resultInitialX = 130;
@@ -745,18 +743,18 @@ public class GameData {
 
 		for (int i = 0; i < rankDrawOrder.length; i += 2) {
 			hitResults[rankDrawOrder[i]].getScaledCopy(rankResultScale).drawCentered(
-					(resultHitInitialX * GameImage.getUIscale()),
-					((resultHitInitialY  + (resultOffsetY * (i / 2))) * GameImage.getUIscale()));
+					resultHitInitialX * uiScale,
+					(resultHitInitialY + (resultOffsetY * (i / 2))) * uiScale);
 			hitResults[rankDrawOrder[i+1]].getScaledCopy(rankResultScale).drawCentered(
-					((resultHitInitialX + resultOffsetX) * GameImage.getUIscale()),
-					((resultHitInitialY  + (resultOffsetY * (i / 2))) * GameImage.getUIscale()));
+					(resultHitInitialX + resultOffsetX) * uiScale,
+					(resultHitInitialY  + (resultOffsetY * (i / 2))) * uiScale);
 			drawSymbolString(String.format("%dx", rankResultOrder[i]),
-					(int) (resultInitialX * GameImage.getUIscale()),
-					(int) ((resultInitialY + (resultOffsetY * (i / 2))) * GameImage.getUIscale()),
+					resultInitialX * uiScale,
+					(resultInitialY + (resultOffsetY * (i / 2))) * uiScale,
 					symbolTextScale, 1f, false);
 			drawSymbolString(String.format("%dx", rankResultOrder[i+1]),
-					(int) ((resultInitialX + resultOffsetX) * GameImage.getUIscale()),
-					(int) ((resultInitialY + (resultOffsetY * (i / 2))) * GameImage.getUIscale()),
+					(resultInitialX + resultOffsetX) * uiScale,
+					(resultInitialY + (resultOffsetY * (i / 2))) * uiScale,
 					symbolTextScale, 1f, false);
 		}
 
@@ -765,17 +763,11 @@ public class GameData {
 		float textY = rankingHeight + 425;
 		float numbersY = textY + 30;
 		drawSymbolString(String.format("%dx", comboMax),
-				(int) (25 * GameImage.getUIscale()),
-				(int) (numbersY * GameImage.getUIscale()), symbolTextScale, 1f, false);
+				25 * uiScale, numbersY * uiScale, symbolTextScale, 1f, false);
 		drawSymbolString(String.format("%02.2f%%", getScorePercent()),
-				(int) ((accuracyX + 20) * GameImage.getUIscale()),
-				(int) (numbersY * GameImage.getUIscale()), symbolTextScale, 1f, false);
-		GameImage.RANKING_MAXCOMBO.getImage().draw(
-				(int) (10 * GameImage.getUIscale()),
-				(int) (textY * GameImage.getUIscale()));
-		GameImage.RANKING_ACCURACY.getImage().draw(
-				(int) (accuracyX * GameImage.getUIscale()),
-				(int) (textY * GameImage.getUIscale()));
+				(accuracyX + 20) * uiScale, numbersY * uiScale, symbolTextScale, 1f, false);
+		GameImage.RANKING_MAXCOMBO.getImage().draw(10 * uiScale, textY * uiScale);
+		GameImage.RANKING_ACCURACY.getImage().draw(accuracyX * uiScale, textY * uiScale);
 
 		// full combo
 		if (comboMax == fullObjectCount) {
@@ -793,7 +785,7 @@ public class GameData {
 		// header
 		Image rankingTitle = GameImage.RANKING_TITLE.getImage();
 		g.setColor(Utils.COLOR_BLACK_ALPHA);
-		g.fillRect(0, 0, width, 100 * GameImage.getUIscale());
+		g.fillRect(0, 0, width, 100 * uiScale);
 		rankingTitle.draw((width * 0.97f) - rankingTitle.getWidth(), 0);
 		float c = width * 0.01f;
 		Utils.FONT_LARGE.drawString(c, c,
diff --git a/src/itdelatrisu/opsu/GameImage.java b/src/itdelatrisu/opsu/GameImage.java
index 4f81b451..b50c49c6 100644
--- a/src/itdelatrisu/opsu/GameImage.java
+++ b/src/itdelatrisu/opsu/GameImage.java
@@ -269,11 +269,11 @@ public enum GameImage {
 			return img.getScaledCopy(0.8f);
 		}
 	},
-	MENU_PlAY ("menu-play", "png", false, false) {
+	MENU_PLAY ("menu-play", "png", false, false) {
 		@Override
 		protected Image process_sub(Image img, int w, int h) {
 			return img.getScaledCopy(0.8f);
-			}
+		}
 	},
 	MENU_EXIT ("menu-exit", "png", false, false) {
 		@Override
diff --git a/src/itdelatrisu/opsu/Utils.java b/src/itdelatrisu/opsu/Utils.java
index c64c44c0..6b6352ef 100644
--- a/src/itdelatrisu/opsu/Utils.java
+++ b/src/itdelatrisu/opsu/Utils.java
@@ -140,11 +140,11 @@ public class Utils {
 		container.setAlwaysRender(true);
 		container.setUpdateOnlyWhenVisible(false);
 
+		// calculate UI scale
 		GameImage.init(width, height);
-		
+
 		// create fonts
 		float fontBase = 12f * GameImage.getUIscale();
-
 		try {
 			Font javaFont = Font.createFont(Font.TRUETYPE_FONT, ResourceLoader.getResourceAsStream(Options.FONT_NAME));
 			Font font    = javaFont.deriveFont(Font.PLAIN, (int) (fontBase * 4 / 3));
diff --git a/src/itdelatrisu/opsu/objects/Spinner.java b/src/itdelatrisu/opsu/objects/Spinner.java
index cbe6038d..d7849f2f 100644
--- a/src/itdelatrisu/opsu/objects/Spinner.java
+++ b/src/itdelatrisu/opsu/objects/Spinner.java
@@ -134,8 +134,8 @@ public class Spinner implements HitObject {
 		rpmImg.setAlpha(alpha);
 		rpmImg.drawCentered(width / 2f, height - rpmImg.getHeight() / 2f);
 		if (timeDiff < 0)
-			data.drawSymbolString(Integer.toString(rpm), (int) ((width + rpmImg.getWidth() * 0.95f) / 2f),
-					(int) (height - data.getScoreSymbolImage('0').getHeight() * 1.025f), 1f, 1f, true);
+			data.drawSymbolString(Integer.toString(rpm), (width + rpmImg.getWidth() * 0.95f) / 2f,
+					height - data.getScoreSymbolImage('0').getHeight() * 1.025f, 1f, 1f, true);
 
 		// spinner meter (subimage)
 		Image spinnerMetre = GameImage.SPINNER_METRE.getImage();
diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java
index 832593c9..fe51c6a8 100644
--- a/src/itdelatrisu/opsu/states/MainMenu.java
+++ b/src/itdelatrisu/opsu/states/MainMenu.java
@@ -133,7 +133,7 @@ public class MainMenu extends BasicGameState {
 
 		// initialize menu buttons
 		Image logoImg = GameImage.MENU_LOGO.getImage();
-		Image playImg = GameImage.MENU_PlAY.getImage();
+		Image playImg = GameImage.MENU_PLAY.getImage();
 		Image exitImg = GameImage.MENU_EXIT.getImage();
 		float exitOffset = (playImg.getWidth() - exitImg.getWidth()) / 3f;
 		logo = new MenuButton(logoImg, width / 2f, height / 2f);