diff --git a/src/bin/commands/demux.rs b/src/bin/commands/demux.rs
index e2bec29..520d386 100644
--- a/src/bin/commands/demux.rs
+++ b/src/bin/commands/demux.rs
@@ -580,7 +580,7 @@ pub(crate) struct Demux {
 
     /// The read structure types to write to their own files (Must be one of T, B, or M for
     /// template reads, sample barcode reads, and molecular barcode reads).
-    /// 
+    ///
     /// Multiple output types may be specified as a space-delimited list.
     #[clap(long, short='b', default_value="T", num_args = 1.. )]
     output_types: Vec<char>,
diff --git a/src/lib/barcode_matching.rs b/src/lib/barcode_matching.rs
index 4372c7c..518835f 100644
--- a/src/lib/barcode_matching.rs
+++ b/src/lib/barcode_matching.rs
@@ -8,7 +8,7 @@ const STARTING_CACHE_SIZE: usize = 1_000_000;
 /// The struct that contains the info related to the best and next best sample barcode match.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct BarcodeMatch {
-    /// Index of the best bardcode match in the corresponding BarcodeMatcher struct that generated
+    /// Index of the best barcode match in the corresponding BarcodeMatcher struct that generated
     /// this match.
     pub best_match: usize,
     /// The number of mismatches to the best matching barcode for the read described by this match.
@@ -74,7 +74,7 @@ impl BarcodeMatcher {
         assert_eq!(
             observed_bases.len(),
             expected_bases.len(),
-            "observed_bases: {}, expected_bases: {}",
+            "Sample barcode length ({}) differs from expected ({}) during barcode matching",
             observed_bases.len(),
             expected_bases.len()
         );
@@ -223,7 +223,9 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "observed_bases: 5, expected_bases: 6")]
+    #[should_panic(
+        expected = "Sample barcode length (5) differs from expected (6) during barcode matching"
+    )]
     fn find_compare_two_sequences_of_different_length() {
         let _mismatches = BarcodeMatcher::count_mismatches("GATTA".as_bytes(), "CTATGT".as_bytes());
     }