diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index f601ce624d..d3012b1981 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -12,7 +12,7 @@ using OpenTK;
 
 namespace osu.Game.Rulesets.Catch.Beatmaps
 {
-    internal class CatchBeatmapProcessor : BeatmapProcessor<CatchHitObject>
+    public class CatchBeatmapProcessor : BeatmapProcessor<CatchHitObject>
     {
         public override void PostProcess(Beatmap<CatchHitObject> beatmap)
         {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
index 036c5bd879..2955b51044 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using OpenTK;
@@ -13,7 +12,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
     {
         private readonly Container dropletContainer;
 
-        public DrawableJuiceStream(JuiceStream s) : base(s)
+        public DrawableJuiceStream(JuiceStream s)
+            : base(s)
         {
             RelativeSizeAxes = Axes.Both;
             Origin = Anchor.BottomLeft;
@@ -21,22 +21,20 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 
             Child = dropletContainer = new Container { RelativeSizeAxes = Axes.Both, };
 
-            foreach (CatchHitObject tick in s.NestedHitObjects.OfType<CatchHitObject>())
+            foreach (var tick in s.NestedHitObjects)
             {
-                TinyDroplet tiny = tick as TinyDroplet;
-                if (tiny != null)
+                switch (tick)
                 {
-                    AddNested(new DrawableDroplet(tiny) { Scale = new Vector2(0.5f) });
-                    continue;
+                    case TinyDroplet tiny:
+                        AddNested(new DrawableDroplet(tiny) { Scale = new Vector2(0.5f) });
+                        break;
+                    case Droplet droplet:
+                        AddNested(new DrawableDroplet(droplet));
+                        break;
+                    case Fruit fruit:
+                        AddNested(new DrawableFruit(fruit));
+                        break;
                 }
-
-                Droplet droplet = tick as Droplet;
-                if (droplet != null)
-                    AddNested(new DrawableDroplet(droplet));
-
-                Fruit fruit = tick as Fruit;
-                if (fruit != null)
-                    AddNested(new DrawableFruit(fruit));
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index a6dc1350be..6df9498881 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Catch.Scoring
 {
-    internal class CatchScoreProcessor : ScoreProcessor<CatchHitObject>
+    public class CatchScoreProcessor : ScoreProcessor<CatchHitObject>
     {
         public CatchScoreProcessor(RulesetContainer<CatchHitObject> rulesetContainer)
             : base(rulesetContainer)
@@ -21,23 +21,25 @@ namespace osu.Game.Rulesets.Catch.Scoring
         {
             foreach (var obj in beatmap.HitObjects)
             {
-                var stream = obj as JuiceStream;
-
-                if (stream != null)
+                switch (obj)
                 {
-                    AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
-                    AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
-
-                    foreach (var unused in stream.NestedHitObjects.OfType<CatchHitObject>())
+                    case JuiceStream stream:
+                        AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
                         AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
 
-                    continue;
+                        foreach (var _ in stream.NestedHitObjects.Cast<CatchHitObject>())
+                            AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
+                        break;
+                    case BananaShower shower:
+                        AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
+
+                        foreach (var _ in shower.NestedHitObjects.Cast<CatchHitObject>())
+                            AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
+                        break;
+                    case Fruit _:
+                        AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
+                        break;
                 }
-
-                var fruit = obj as Fruit;
-
-                if (fruit != null)
-                    AddJudgement(new CatchJudgement { Result = HitResult.Perfect });
             }
 
             base.SimulateAutoplay(beatmap);