diff --git a/app/Bootstrap/FinderComposer.php b/app/Bootstrap/FinderComposer.php
index 5d18b56..cf694f1 100644
--- a/app/Bootstrap/FinderComposer.php
+++ b/app/Bootstrap/FinderComposer.php
@@ -15,6 +15,16 @@ class FinderComposer
     /** @const Application paths to be hidden */
     protected const APP_FILES = ['app', 'node_modules', 'vendor', 'index.php'];
 
+    /** @const Array of sort options mapped to their respective methods  */
+    public const SORT_METHODS = [
+        'accessed' => SortMethods\Accessed::class,
+        'changed' => SortMethods\Changed::class,
+        'modified' => SortMethods\Modified::class,
+        'name' => SortMethods\Name::class,
+        'natural' => SortMethods\Natural::class,
+        'type' => SortMethods\Type::class,
+    ];
+
     /** @var Config Application config */
     protected $config;
 
@@ -50,28 +60,12 @@ class FinderComposer
         if ($sortOrder instanceof Closure) {
             $finder->sort($sortOrder);
         } else {
-            switch ($sortOrder) {
-                case 'accessed':
-                    $finder->sortByAccessedTime();
-                    break;
-                case 'changed':
-                    $finder->sortByChangedTime();
-                    break;
-                case 'modified':
-                    $finder->sortByModifiedTime();
-                    break;
-                case 'name':
-                    $finder->sortByName();
-                    break;
-                case 'natural':
-                    $finder->sortByName(true);
-                    break;
-                case 'type':
-                    $finder->sortByType();
-                    break;
-                default:
-                    throw new RuntimeException("Invalid sort option '{$sortOrder}'");
+            if (! array_key_exists($sortOrder, self::SORT_METHODS)) {
+                throw new RuntimeException("Invalid sort option '{$sortOrder}'");
             }
+
+            $sortMethod = self::SORT_METHODS[$sortOrder];
+            call_user_func(new $sortMethod, $finder);
         }
 
         if ($this->config->get('app.reverse_sort', false)) {
diff --git a/app/Bootstrap/SortMethods/Accessed.php b/app/Bootstrap/SortMethods/Accessed.php
new file mode 100644
index 0000000..96d01a8
--- /dev/null
+++ b/app/Bootstrap/SortMethods/Accessed.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Bootstrap\SortMethods;
+
+use Symfony\Component\Finder\Finder;
+
+class Accessed extends SortMethod
+{
+    /**
+     * Sort by file accessed time.
+     *
+     * @param \Symfony\Component\Finder\Finder $finder
+     *
+     * @return void
+     */
+    public function __invoke(Finder $finder): void
+    {
+        $finder->sortByAccessedTime();
+    }
+}
diff --git a/app/Bootstrap/SortMethods/Changed.php b/app/Bootstrap/SortMethods/Changed.php
new file mode 100644
index 0000000..097d217
--- /dev/null
+++ b/app/Bootstrap/SortMethods/Changed.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Bootstrap\SortMethods;
+
+use Symfony\Component\Finder\Finder;
+
+class Changed extends SortMethod
+{
+    /**
+     * Sory by file changed time.
+     *
+     * @param \Symfony\Component\Finder\Finder $finder
+     *
+     * @return void
+     */
+    public function __invoke(Finder $finder): void
+    {
+        $finder->sortByChangedTime();
+    }
+}
diff --git a/app/Bootstrap/SortMethods/Modified.php b/app/Bootstrap/SortMethods/Modified.php
new file mode 100644
index 0000000..c4c0afa
--- /dev/null
+++ b/app/Bootstrap/SortMethods/Modified.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Bootstrap\SortMethods;
+
+use Symfony\Component\Finder\Finder;
+
+class Modified extends SortMethod
+{
+    /**
+     * Sort by file modified time.
+     *
+     * @param \Symfony\Component\Finder\Finder $finder
+     *
+     * @return void
+     */
+    public function __invoke(Finder $finder): void
+    {
+        $finder->sortByModifiedTime();
+    }
+}
diff --git a/app/Bootstrap/SortMethods/Name.php b/app/Bootstrap/SortMethods/Name.php
new file mode 100644
index 0000000..29ffa00
--- /dev/null
+++ b/app/Bootstrap/SortMethods/Name.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Bootstrap\SortMethods;
+
+use Symfony\Component\Finder\Finder;
+
+class Name extends SortMethod
+{
+    /**
+     * Sort by file name.
+     *
+     * @param \Symfony\Component\Finder\Finder $finder
+     *
+     * @return void
+     */
+    public function __invoke(Finder $finder): void
+    {
+        $finder->sortByName();
+    }
+}
diff --git a/app/Bootstrap/SortMethods/Natural.php b/app/Bootstrap/SortMethods/Natural.php
new file mode 100644
index 0000000..da9db8a
--- /dev/null
+++ b/app/Bootstrap/SortMethods/Natural.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Bootstrap\SortMethods;
+
+use Symfony\Component\Finder\Finder;
+
+class Natural extends SortMethod
+{
+    /**
+     * Sort by (natural) file name.
+     *
+     * @param \Symfony\Component\Finder\Finder $finder
+     *
+     * @return void
+     */
+    public function __invoke(Finder $finder): void
+    {
+        $finder->sortByName(true);
+    }
+}
diff --git a/app/Bootstrap/SortMethods/SortMethod.php b/app/Bootstrap/SortMethods/SortMethod.php
new file mode 100644
index 0000000..6f7b3e7
--- /dev/null
+++ b/app/Bootstrap/SortMethods/SortMethod.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Bootstrap\SortMethods;
+
+use Symfony\Component\Finder\Finder;
+
+abstract class SortMethod
+{
+    /**
+     * Run the sort method.
+     *
+     * @param \Symfony\Component\Finder\Finder $finder
+     *
+     * @return void
+     */
+    abstract public function __invoke(Finder $finder): void;
+}
diff --git a/app/Bootstrap/SortMethods/Type.php b/app/Bootstrap/SortMethods/Type.php
new file mode 100644
index 0000000..f097757
--- /dev/null
+++ b/app/Bootstrap/SortMethods/Type.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Bootstrap\SortMethods;
+
+use Symfony\Component\Finder\Finder;
+
+class Type extends SortMethod
+{
+    /**
+     * Sory by file type.
+     *
+     * @param \Symfony\Component\Finder\Finder $finder
+     *
+     * @return void
+     */
+    public function __invoke(Finder $finder): void
+    {
+        $finder->sortByType();
+    }
+}