diff --git a/src/command.rs b/src/command.rs
index 55cbb5e74..f58069159 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -59,11 +59,11 @@ impl<'a> Command<'a> {
     }
 
     pub fn get_name_with_unused_parameters(&self) -> String {
-        let parameters =
-            self.get_unused_parameters()
-                .fold(String::new(), |output, (parameter, value)| {
-                    output + &format!("{} = {}, ", parameter, value.to_string())
-                });
+        let parameters = self
+            .get_unused_parameters()
+            .fold(String::new(), |output, (parameter, value)| {
+                output + &format!("{} = {}, ", parameter, value)
+            });
         let parameters = parameters.trim_end_matches(", ");
         let parameters = if parameters.is_empty() {
             "".into()
diff --git a/src/parameter/mod.rs b/src/parameter/mod.rs
index 994f4a2fd..c7667137e 100644
--- a/src/parameter/mod.rs
+++ b/src/parameter/mod.rs
@@ -1,4 +1,5 @@
 use crate::util::number::Number;
+use std::fmt::Display;
 
 pub mod range_step;
 pub mod tokenize;
@@ -9,12 +10,13 @@ pub enum ParameterValue {
     Numeric(Number),
 }
 
-impl ToString for ParameterValue {
-    fn to_string(&self) -> String {
-        match self {
+impl Display for ParameterValue {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let str = match self {
             ParameterValue::Text(ref value) => value.clone(),
             ParameterValue::Numeric(value) => value.to_string(),
-        }
+        };
+        write!(f, "{}", str)
     }
 }
 
diff --git a/src/util/min_max.rs b/src/util/min_max.rs
index 9e11f5550..d4ee07ec6 100644
--- a/src/util/min_max.rs
+++ b/src/util/min_max.rs
@@ -1,5 +1,3 @@
-use std::iter::Iterator;
-
 /// A max function for f64's without NaNs
 pub fn max(vals: &[f64]) -> f64 {
     *vals