diff --git a/src/io.rs b/src/io.rs
index 4000ed7..ab30fdd 100644
--- a/src/io.rs
+++ b/src/io.rs
@@ -157,6 +157,7 @@ fn read_window_file(window_file: &str, cfg: &Config) -> Result<Histogram> {
     Ok(Histogram::new(num_points as u32, hist))
 }
 
+// Write WHAM calculation results to out_file.
 pub fn write_results(out_file: &str, ds: &Dataset, free: &Vec<f64>, prob: &Vec<f64>) -> Result<()> {
     let output = File::create(out_file)
         .chain_err(|| format!("Failed to create file with path {}", out_file))?;
diff --git a/src/lib.rs b/src/lib.rs
index 333bbaa..daa79f0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -145,7 +145,6 @@ pub fn run(cfg: &Config) -> Result<()>{
     println!("Supplied WHAM options: {}", &cfg);
 
     println!("Reading input files.");
-    // TODO Better error handling with nice error messages instead of a panic!
     let dataset = io::read_data(&cfg).chain_err(|| "Failed to create histogram.")?;
     println!("{}", &dataset);