diff --git a/src/distro/os_config/base_config.rs b/src/distro/os_config/base_config.rs
index 457ccbb..e4686c2 100644
--- a/src/distro/os_config/base_config.rs
+++ b/src/distro/os_config/base_config.rs
@@ -90,18 +90,18 @@ pub struct Partition {
 
 #[derive(Clone, Debug, Deserialize, RustyValue)]
 pub enum FileSystem {
-    VFAT,
-    BFS,
+    VFat,
+    Bfs,
     CramFS,
     Ext2,
     Ext3,
     Ext4,
-    FAT,
-    MSDOS,
-    XFS,
-    BTRFS,
+    Fat,
+    Msdos,
+    Xfs,
+    Btrfs,
     Minix,
-    F2FS,
+    F2fs,
 }
 
 #[derive(Clone, Debug, Deserialize, RustyValue)]
@@ -131,7 +131,7 @@ pub enum DesktopConfig {
     I3Gaps,
     HerbstluftWM,
     AwesomeWM,
-    BSPWM,
+    Bspwm,
 }
 
 pub type ExtraPackages = Vec<String>;
diff --git a/src/task/custom_task.rs b/src/task/custom_task.rs
index 88310d2..428079a 100644
--- a/src/task/custom_task.rs
+++ b/src/task/custom_task.rs
@@ -68,5 +68,5 @@ fn config_is_falsy(config: &embed_nu::Value) -> bool {
     } else if let Ok(b) = config.as_bool() {
         return !b;
     }
-    return false;
+    false
 }
diff --git a/src/task/mod.rs b/src/task/mod.rs
index a1bc012..f98f81b 100644
--- a/src/task/mod.rs
+++ b/src/task/mod.rs
@@ -37,16 +37,12 @@ impl Task {
     pub fn compare(&self, other: &Self) -> Ordering {
         if self.is_base() && other.is_custom() {
             Ordering::Less
-        } else if self.is_custom() && other.is_base() {
+        } else if self.is_custom() && other.is_base() || self.order() > other.order() {
             Ordering::Greater
+        } else if self.order() < other.order() {
+            Ordering::Less
         } else {
-            if self.order() > other.order() {
-                Ordering::Greater
-            } else if self.order() < other.order() {
-                Ordering::Less
-            } else {
-                Ordering::Equal
-            }
+            Ordering::Equal
         }
     }
 }