diff --git a/src/lib.rs b/src/lib.rs
index 5c03a09..9ed0f5b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,13 +1,9 @@
-#[macro_use]
-extern crate lazy_static;
+#[macro_use] extern crate lazy_static;
 extern crate term;
 
 use std::error::Error;
-use std::io::Error as IoError;
-use std::io::ErrorKind;
-use std::fmt::Display;
-use std::fmt::Formatter;
-use std::fmt::Result as FmtResult;
+use std::io::{Error as IoError, ErrorKind};
+use std::fmt::{Display, Formatter, Result as FmtResult};
 
 pub mod util_io;
 pub mod util_os;
diff --git a/src/util_clap.rs b/src/util_clap.rs
index 8b608d4..d986181 100644
--- a/src/util_clap.rs
+++ b/src/util_clap.rs
@@ -1,7 +1,6 @@
 use std::process;
 use clap::{App, Arg, ArgMatches};
-use crate::XResult;
-use crate::util_msg;
+use crate::{XResult, util_msg};
 
 pub type CommandError = XResult<Option<i32>>;
 
diff --git a/src/util_file.rs b/src/util_file.rs
index ff48814..86ed66c 100644
--- a/src/util_file.rs
+++ b/src/util_file.rs
@@ -1,5 +1,8 @@
-use std::{ env, fs::{ self, File }, io::{ Lines, BufReader }, path::{ Path, PathBuf } };
-use crate::{ iff, util_os, util_io, util_msg, new_box_ioerror, XResult };
+use std::env;
+use std::fs::{self, File};
+use std::io::{Lines, BufReader};
+use std::path::{Path, PathBuf};
+use crate::{iff, util_os, util_io, util_msg, new_box_ioerror, XResult};
 
 pub struct JoinFilesReader {
     files: Vec<String>,
diff --git a/src/util_git.rs b/src/util_git.rs
index d97588b..8f1f5c9 100644
--- a/src/util_git.rs
+++ b/src/util_git.rs
@@ -1,7 +1,5 @@
 use std::process::Command;
-use crate::XResult;
-use crate::util_msg;
-use crate::util_cmd::run_command_and_wait;
+use crate::{XResult, util_msg, util_cmd};
 
 const LANG: &str = "LANG";
 const EN_US: &str = "en_US";
@@ -59,7 +57,7 @@ pub fn git_push(working_dir: Option<&str>) {
     let mut cmd = new_git_command(working_dir);
     cmd.arg("push");
     util_msg::print_info(&format!("Exec: {:?}", cmd));
-    if let Err(e) = run_command_and_wait(&mut cmd) {
+    if let Err(e) = util_cmd::run_command_and_wait(&mut cmd) {
         util_msg::print_error(&format!("Run git push failed: {}", e));
     }
 }
@@ -71,7 +69,7 @@ pub fn git_add(working_dir: Option<&str>, files: &[String]) {
         cmd.arg(&f);
     }
     util_msg::print_info(&format!("Exec: {:?}", cmd));
-    if let Err(e) = run_command_and_wait(&mut cmd) {
+    if let Err(e) = util_cmd::run_command_and_wait(&mut cmd) {
         util_msg::print_error(&format!("Run git add failed: {}", e));
     }
 }
@@ -85,7 +83,7 @@ pub fn git_commit(working_dir: Option<&str>, message: &str, files: &[String]) {
         cmd.arg(&f);
     }
     util_msg::print_info(&format!("Exec: {:?}", cmd));
-    if let Err(e) = run_command_and_wait(&mut cmd) {
+    if let Err(e) = util_cmd::run_command_and_wait(&mut cmd) {
         util_msg::print_error(&format!("Run git commit failed: {}", e));
     }
 }
diff --git a/src/util_io.rs b/src/util_io.rs
index 279d8f8..a4825d5 100644
--- a/src/util_io.rs
+++ b/src/util_io.rs
@@ -1,8 +1,8 @@
-use std::io::{ self, Write, ErrorKind, prelude::* };
+use std::io::{self, Write, ErrorKind, prelude::*};
 use std::fs::File;
-use std::time::{ SystemTime, Duration };
+use std::time::{SystemTime, Duration};
 
-use crate::{SimpleError, XResult, new_box_ioerror};
+use crate::{SimpleError, XResult};
 use crate::util_size;
 use crate::util_msg;
 use crate::util_file;
@@ -86,7 +86,7 @@ pub fn get_read_stdin_or_file(file: &str) -> XResult<Box<dyn Read>> {
     } else {
         match File::open(&util_file::resolve_file_path(file)) {
             Ok(f) => Ok(Box::new(f)),
-            Err(err) => Err(new_box_ioerror(&format!("Open file {}, erorr: {}", file, err))),
+            Err(err) => Err(SimpleError::new(format!("Open file {}, erorr: {}", file, err)).into()),
         }
     }
 }
diff --git a/src/util_msg.rs b/src/util_msg.rs
index d6ccb2a..a4af550 100644
--- a/src/util_msg.rs
+++ b/src/util_msg.rs
@@ -1,4 +1,6 @@
-use std::{ env, io::{ self, Write }, sync::{ Arc, Mutex } };
+use std::env;
+use std::io::{self, Write};
+use std::sync::{Arc, Mutex};
 
 lazy_static! {
     pub static ref IS_ATTY: bool = is_atty();
diff --git a/src/util_net.rs b/src/util_net.rs
index 6a52159..dc624fe 100644
--- a/src/util_net.rs
+++ b/src/util_net.rs
@@ -1,4 +1,4 @@
-use std::fmt::{ self, Display, Formatter };
+use std::fmt::{self, Display, Formatter};
 use std::result::Result;
 use std::net::SocketAddr;
 use crate::XResult;
diff --git a/src/util_term.rs b/src/util_term.rs
index 29a4a84..e6f8d61 100644
--- a/src/util_term.rs
+++ b/src/util_term.rs
@@ -1,5 +1,4 @@
-use std::io;
-use std::io::Write;
+use std::io::{self, Write};
 
 pub const RED:    &str = "\x1B[91m";
 pub const GREEN:  &str = "\x1B[92m";
diff --git a/src/util_time.rs b/src/util_time.rs
index 558fd47..2254a1d 100644
--- a/src/util_time.rs
+++ b/src/util_time.rs
@@ -1,5 +1,4 @@
-use std::time::SystemTime;
-use std::time::Duration;
+use std::time::{SystemTime, Duration};
 
 pub fn get_current_secs() -> u64 {
     SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).map(|d| d.as_secs()).unwrap_or(0 /* SHOULD NOT HAPPEN */ )