added quiet option
cleaned