diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs
index 2094631b7..6e3f6e364 100644
--- a/src/uu/expand/src/expand.rs
+++ b/src/uu/expand/src/expand.rs
@@ -38,7 +38,7 @@ static DEFAULT_TABSTOP: usize = 8;
 
 /// The mode to use when replacing tabs beyond the last one specified in
 /// the `--tabs` argument.
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq)]
 enum RemainingMode {
     None,
     Slash,
@@ -195,7 +195,6 @@ fn tabstops_parse(s: &str) -> Result<(RemainingMode, Vec<usize>), ParseError> {
     Ok((remaining_mode, nums))
 }
 
-#[derive(Debug)]
 struct Options {
     files: Vec<String>,
     tabstops: Vec<usize>,
@@ -345,11 +344,11 @@ fn next_tabstop(tabstops: &[usize], col: usize, remaining_mode: &RemainingMode)
             Some(t) => t - col,
             None => {
                 let step_size = tabstops[num_tabstops - 1];
-                let last_fixed_tabstop = tabstops[num_tabstops-2];
-                let characters_since_last_tabstop = col-last_fixed_tabstop;
+                let last_fixed_tabstop = tabstops[num_tabstops - 2];
+                let characters_since_last_tabstop = col - last_fixed_tabstop;
 
-                let steps_required = 1 + characters_since_last_tabstop/step_size;
-                steps_required*step_size-characters_since_last_tabstop
+                let steps_required = 1 + characters_since_last_tabstop / step_size;
+                steps_required * step_size - characters_since_last_tabstop
             }
         },
         RemainingMode::Slash => match tabstops[0..num_tabstops - 1].iter().find(|&&t| t > col) {
@@ -378,7 +377,7 @@ enum CharType {
 
 fn expand(options: &Options) -> std::io::Result<()> {
     use self::CharType::*;
-    
+
     let mut output = BufWriter::new(stdout());
     let ts = options.tabstops.as_ref();
     let mut buf = Vec::new();
diff --git a/tests/by-util/test_expand.rs b/tests/by-util/test_expand.rs
index 3436b02e9..5b4f269ea 100644
--- a/tests/by-util/test_expand.rs
+++ b/tests/by-util/test_expand.rs
@@ -275,7 +275,7 @@ fn test_tabs_shortcut() {
         .args(&["-2", "-5", "-7"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("  a  b c");
 }
 
@@ -285,7 +285,7 @@ fn test_comma_separated_tabs_shortcut() {
         .args(&["-2,5", "-7"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("  a  b c");
 }
 
@@ -295,7 +295,7 @@ fn test_tabs_and_tabs_shortcut_mixed() {
         .args(&["-2", "--tabs=5", "-7"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("  a  b c");
 }
 
@@ -305,7 +305,7 @@ fn test_ignore_initial_plus() {
         .args(&["--tabs=+3"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("   a  b  c");
 }
 
@@ -315,7 +315,7 @@ fn test_ignore_initial_pluses() {
         .args(&["--tabs=++3"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("   a  b  c");
 }
 
@@ -325,7 +325,7 @@ fn test_ignore_initial_slash() {
         .args(&["--tabs=/3"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("   a  b  c");
 }
 
@@ -335,7 +335,7 @@ fn test_ignore_initial_slashes() {
         .args(&["--tabs=//3"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("   a  b  c");
 }
 
@@ -345,7 +345,7 @@ fn test_ignore_initial_plus_slash_combination() {
         .args(&["--tabs=+/3"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("   a  b  c");
 }
 
@@ -355,7 +355,7 @@ fn test_comma_with_plus_1() {
         .args(&["--tabs=3,+6"])
         .pipe_in("\t111\t222\t333")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("   111   222   333");
 }
 
@@ -365,7 +365,7 @@ fn test_comma_with_plus_2() {
         .args(&["--tabs=1,+5"])
         .pipe_in("\ta\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is(" a    b    c");
 }
 
@@ -375,7 +375,7 @@ fn test_comma_with_plus_3() {
         .args(&["--tabs=2,+5"])
         .pipe_in("a\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("a b    c");
 }
 
@@ -385,6 +385,6 @@ fn test_comma_with_plus_4() {
         .args(&["--tabs=1,3,+5"])
         .pipe_in("a\tb\tc")
         .succeeds()
-        //               01234567890
+        //          01234567890
         .stdout_is("a  b    c");
 }