diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
index 741520a798..30350f9a39 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
@@ -41,15 +41,15 @@ namespace osu.Desktop.VisualTests.Tests
 
         private void addHitJudgement()
         {
-            TaikoScoreResult score = RNG.Next(2) == 0 ? TaikoScoreResult.Good : TaikoScoreResult.Great;
+            TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
 
             playfield.OnJudgement(new DrawableTestHit(new TaikoHitObject())
             {
-                X = RNG.NextSingle(score == TaikoScoreResult.Good ? -0.1f : -0.05f, score == TaikoScoreResult.Good ? 0.1f : 0.05f),
+                X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
                 Judgement = new TaikoJudgementInfo
                 {
                     Result = HitResult.Hit,
-                    Score = score,
+                    TaikoResult = hitResult,
                     TimeOffset = 0,
                     ComboAtHit = 1,
                     SecondHit = RNG.Next(10) == 0
@@ -95,11 +95,6 @@ namespace osu.Desktop.VisualTests.Tests
             protected override void UpdateState(ArmedState state)
             {
             }
-
-            protected override void Update()
-            {
-                // Doesn't move
-            }
         }
     }
 }
diff --git a/osu.Game.Modes.Taiko/UI/HitTarget.cs b/osu.Game.Modes.Taiko/UI/HitTarget.cs
index 9f20e1da0c..cc332abb8d 100644
--- a/osu.Game.Modes.Taiko/UI/HitTarget.cs
+++ b/osu.Game.Modes.Taiko/UI/HitTarget.cs
@@ -39,35 +39,27 @@ namespace osu.Game.Modes.Taiko.UI
                 new Box
                 {
                     Name = "Bar Upper",
-
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
-
                     Y = border_offset,
-
                     Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),
-
                     Alpha = 0.1f
                 },
                 new CircularContainer
                 {
                     Name = "Finisher Ring",
-
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-
                     Size = new Vector2(finisher_diameter),
-
+                    Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = 2,
                     Alpha = 0.1f,
-
                     Children = new[]
                     {
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-
                             Alpha = 0,
                             AlwaysPresent = true
                         }
@@ -76,22 +68,18 @@ namespace osu.Game.Modes.Taiko.UI
                 new CircularContainer
                 {
                     Name = "Normal Ring",
-
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-
                     Size = new Vector2(normal_diameter),
-
+                    Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = 2,
                     Alpha = 0.5f,
-
                     Children = new[]
                     {
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-
                             Alpha = 0,
                             AlwaysPresent = true
                         }
@@ -100,14 +88,10 @@ namespace osu.Game.Modes.Taiko.UI
                 new Box
                 {
                     Name = "Bar Lower",
-
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
-
                     Y = -border_offset,
-
                     Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),
-
                     Alpha = 0.1f
                 },
             };
diff --git a/osu.Game.Modes.Taiko/UI/InputDrum.cs b/osu.Game.Modes.Taiko/UI/InputDrum.cs
index 607fd205bb..b763b53aa2 100644
--- a/osu.Game.Modes.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Modes.Taiko/UI/InputDrum.cs
@@ -29,25 +29,18 @@ namespace osu.Game.Modes.Taiko.UI
                 new TaikoHalfDrum(false)
                 {
                     Name = "Left Half",
-
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreRight,
-
                     RelativeSizeAxes = Axes.Both,
-
                     Keys = new List<Key>(new[] { Key.F, Key.D })
                 },
                 new TaikoHalfDrum(true)
                 {
                     Name = "Right Half",
-
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreLeft,
-
                     RelativeSizeAxes = Axes.Both,
-
                     Position = new Vector2(-1f, 0),
-
                     Keys = new List<Key>(new[] { Key.J, Key.K })
                 }
             };
@@ -81,25 +74,20 @@ namespace osu.Game.Modes.Taiko.UI
                     {
                         Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
                         Origin = Anchor.Centre,
-
                         RelativeSizeAxes = Axes.Both
                     },
                     outerHit = new Sprite
                     {
                         Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
                         Origin = Anchor.Centre,
-
                         RelativeSizeAxes = Axes.Both,
-
                         Alpha = 0,
-
                         BlendingMode = BlendingMode.Additive
                     },
                     inner = new Sprite
                     {
                         Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
                         Origin = Anchor.Centre,
-
                         RelativeSizeAxes = Axes.Both,
                         Size = new Vector2(0.7f)
                     },
@@ -107,12 +95,9 @@ namespace osu.Game.Modes.Taiko.UI
                     {
                         Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
                         Origin = Anchor.Centre,
-
                         RelativeSizeAxes = Axes.Both,
                         Size = new Vector2(0.7f),
-
                         Alpha = 0,
-
                         BlendingMode = BlendingMode.Additive
                     }
                 };
diff --git a/osu.Game.Modes.Taiko/UI/JudgementText.cs b/osu.Game.Modes.Taiko/UI/JudgementText.cs
index a65e85e0af..8d86e880d6 100644
--- a/osu.Game.Modes.Taiko/UI/JudgementText.cs
+++ b/osu.Game.Modes.Taiko/UI/JudgementText.cs
@@ -40,31 +40,24 @@ namespace osu.Game.Modes.Taiko.UI
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    
                     AutoSizeAxes = Axes.Both,
-
                     Children = new Drawable[]
                     {
                         new BufferedContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-
                             BlurSigma = new Vector2(10),
                             CacheDrawnFrameBuffer = true,
-
                             RelativeSizeAxes = Axes.Both,
                             Size = new Vector2(3),
-
                             BlendingMode = BlendingMode.Additive,
-
                             Children = new[]
                             {
                                 glowText = new OsuSpriteText
                                 {
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
-
                                     Font = "Venera",
                                     TextSize = 22f,
                                 }
@@ -74,7 +67,6 @@ namespace osu.Game.Modes.Taiko.UI
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-
                             Font = "Venera",
                             TextSize = 22f,
                         }
@@ -97,14 +89,14 @@ namespace osu.Game.Modes.Taiko.UI
                     movementDirection = 1;
                     break;
                 case HitResult.Hit:
-                    switch (Judgement.Score)
+                    switch (Judgement.TaikoResult)
                     {
-                        case TaikoScoreResult.Good:
+                        case TaikoHitResult.Good:
                             judgementColour = colours.Green;
                             judgementText = "GOOD";
                             textContainer.Scale = new Vector2(0.45f);
                             break;
-                        case TaikoScoreResult.Great:
+                        case TaikoHitResult.Great:
                             judgementColour = colours.Blue;
                             judgementText = "GREAT";
                             break;
diff --git a/osu.Game.Modes.Taiko/UI/RingExplosion.cs b/osu.Game.Modes.Taiko/UI/RingExplosion.cs
index e405fa0bfb..2bc1d2d3eb 100644
--- a/osu.Game.Modes.Taiko/UI/RingExplosion.cs
+++ b/osu.Game.Modes.Taiko/UI/RingExplosion.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Modes.Taiko.UI
             BorderThickness = 1;
 
             Alpha = 0.15f;
+            Masking = true;
 
             Children = new[]
             {
@@ -55,12 +56,12 @@ namespace osu.Game.Modes.Taiko.UI
             if (Judgement.SecondHit)
                 Size *= 1.5f;
 
-            switch (Judgement.Score)
+            switch (Judgement.TaikoResult)
             {
-                case TaikoScoreResult.Good:
+                case TaikoHitResult.Good:
                     innerFill.Colour = colours.Green;
                     break;
-                case TaikoScoreResult.Great:
+                case TaikoHitResult.Great:
                     innerFill.Colour = colours.Blue;
                     break;
             }