Added clean output option